I would definitly wait for the new speed changes. If you have to much money, well buy them all. ^^
As a M/K user i like to fly ungimbaled, at least in agile ships. And i think the advantage of better ship control / manovering for Joystick users might vanish a little bit more, with those changes...