Yes Sam, I find that a35mm on your rangefinder would be the way to go. If you were going to stump up the money for a nokton I would suggest you get the 35mm Ultron.
This is the lens that I use most on my Bessa R, the quality is excellent. Of course if you crack that lottery - a 35mm Summilux.....