+1 on the FM2 vs the FM3, I sold the latter and kept the FM2 because I didn't like the finder on the FM3, basically there's a needle metering on the side (left or right, can't remember anymore) and the background is transparent, if that side's background is dark you will have a hard time reading the metering.
For 35mm, I heard good things about the 35mm 1.4 but it's big. If you don't mind something longer, the Voigtlander 40mm f/2 is also pretty good.
For 28mm, the 28mm 2.8 AI-s is rated highly and it is really good. I sold mine because I wanted something smaller and bought the Voigtlander 28mm 2.8 instead. Have a 24mm 2.8 AI-s if I want to go wider but I use the Voigtlander 90% of the time because it is so small.