Spinning in circles (new camera)

[without_tooth]

I enjoy photography. I've been happy shooting with whatever I could get my hands on for the majority of my life - high school, university and now a few years out. As it stands today, I have no camera. I have money to get new gear - probably in the $2000 range. But in my mind, I'm flip-flopping between a mirrorless and DSLR. While I don't fall into the category of GAS, I am interested in buying something solid that I'll get years of use out of.

I enjoy some aspects of street photography, but not necessarily people only. I like wandering around places and shooting anything that catches my eye - people, landscape, flowers, architecture, etc - not sports.

I like the FujiFilm XPro1. The size and portability for my style of photography lends it nicely to walking around all day. And I like the ability to change lenses. It would be a no brainer for me, but with the release of the X100s and immensely better focusing and other corrected issues, I'm left to ponder the waiting game for the XPro1s/2 release, or 'settling' for the X100s.

But the other half of me is thinking maybe I should get a DSLR - like the Nikon D600 and a 50mm prime. That there's a better shelf life for the Nikon that Fuji.

While the future could see me getting into more styles of photography, at least the near future will see me doing what I always do - wandering and shooting. So not sure how practical a D600 would be for those adventures.

Any advice? Should I get an X100s now and in future grab a full frame DSLR? Should I hold off for the XPro1s/2 update? Or get an XPro1?