Do it yourself

Hi there, I have a question about moisture and water in the basement. My home is on a slope and the basemement has had water each winter during the raining season. The water comes in 2 ways: 1. Through the joints in the concrete floor: I fixed this by putting a sump pump into the floor right at that spot and that worked extremely well. 2. Through the cold joints between the concrete wall and the concrete floor. The concrete wall has about 5 feet of soil on the outside, so it is actually pretty good. However, I am not quite sure how to fix this. Do I open the concrete floor along the wall and put a french drain underneath that runs into the sump pump basin that I already put in ? That doesn't sound like the right solution since the water is not pressed through the floor but the joint between the floor and the wall. Eventually, I would like to put tile on the floor so I want to make sure that I fix this problem. Any idea, please let me know :-) Thanks Daniel