+1 to Basti and what he said about the Never Summer Evo, especially if you're looking to throw in a little more all-mountain riding. Speaking of a shorter board, I'll just throw the Burton Nug out there at you too. You could ride a Nug like 8cm shorter than your usual and from what I've heard they're surprisingly stable at high speeds. Oh and maybe take a peek at the Flow Quantum too. Good luck hunting man.
Board - 2012 Burton Restricted Easy Livin' Flying V 158
Bindings - 2012 Burton Cartels