Swale or trench drain at base of hill

My stone foundation house has water issues in the basement, my house sits about 20 feet off of a elevated railway which means a steep slope towards my house. I thought I had graded it well enough but I still have rainwater getting in. I considered doing a swale at the base of the hill sloping towards a side yard, or doing a exterior "trench drain" with perforated pvc inside. Concerned the trench drain would clog though but with the swale its only getting surface water, how much is beneath the surface that will make it to my basement wall ?

Pic is included.

To get a dry basement, it is a two step process whether it is a modern concrete basement or a field stone one.

You have addressed the first I think, by diverting the water coming off the hill on the upper side, but water will still be surrounding the walls by hydraulic pressure. To remove that you have to get the water that does get to your basement walls; out. In your case you would be better off to put a drain channel where your walls intersect with your floor and divert the water to daylight, which means running it down hill for however long it takes. This can be a trench or drainage tiles, but has to be of sufficient size to carry the volume of water you are getting on the inside of your basement.

It is easier said than done, because diverting the water to daylight can be wrought with other problems.