If you like the 50's on FF then you can consider any of the following.
Another vote for the Nokton 35mm f/1.2, if you can live with the size. The last portion of that sentence is very important.
The Nokton 40mm f/1.4 is very easy to focus if you get a good copy, however the bokeh is sometimes a bit harsh.
I enjoy the Zeiss Biogon 35 as its easy to focus at any distance or f stop. My Lux is outstanding wide open, but it does some exhibit focus shift over the aperture range.