It's a little hard to say for sure as I've only ever shot the 50mm f1.8 on my Canon. That being said, I think I would absolutely love to have a 35mm f1.8. The 50mm is a phenomenal lens but I believe the 35mm would get you in closer and be a better lens for you. I find with the 50mm I sometimes don't have as much room as I would like to have and I "think" the 35mm would let me get in closer.

All that being said, I think you'll be happy with either. If you are really concerned, see if someone nearby has a 50mm or a 35mm that you can borrow for a few days. They're relatively inexpensive but it might be worth trying before you buy.