As of right now, I think I'll go with a 35mm f/1.4 and that 21mm. 1.2 isn't that much faster than 1.4, right?
I use a 35mm on my Nikon right now, and most of the time I'm alright. There are a couple of times where I just wish I had a wider lens, though. I've never really felt the need for a longer lens, although I don't do much portraiture.