I personally will be joining the e6-v2 buy (I think), just because I prefer linear switches to buckling spring, and with the e6 I have the option to customize my board a bit more than I might the new model Fs.
I've heard great things about the new Model F boards too, as I've had friends who had tried one at a meetup and loved it.
And also, if you're into artisans, finding them for buckling spring boards is definitely harder and (usually) more expensive.
The only reason I suggest one instead of the other, is because you mentioned wanting to curb your spending habits. While of course buying one or the other might not be curbing your habits, it might be good to decide which one you'll get more use out of and appreciate more.
I hope this helps a little :-)