Keep what you have if it's as mechanically sound as you say. You should be able to pick up some clocks no problem, and as you already plan on fitting an aftermarket fairing you won't miss the original.

How about fitting a race dash? Fairly cheap and available right now off the net.
_________________
MC21SP Plaything
BMW F800GS Bumblebee
Triumph 9551 Daytona Big boys toy
FJ1100 Sporting relic
GTS1000 oddball