If your SP4 runs everything you need, I'd wait. If it's starting to break down and you need to run x86 apps on the go, I'd suggest getting one of the current Surface offerings. Or, potentially, I'd grab a "good enough" laptop from the likes of Dell or HP and play the waiting game.
My situation...