Do the motor upgrade. I would guess a planar 2 with the new motor would be a better deck (from the point of speed stability) than a planar 3. I put the new motor on my planar 3 (when I moved from the UK to the US) and it was a very convincing upgrade.
Also search the archives for re-oiling the bearing as oil level makes a huge difference.
Also search the archives for re-oiling the bearing as oil level makes a huge difference.