"It never goes any higher than 3000rpm, and seems to always be between 1000 & 1500 rpm short."
My Spider '91 has a similar thing going on, where it sounds like I'm revving quite hard, but actually the needle shows about 2500rpm. And if I take it to 3k, I think I'm going to do it some harm

so I back off. I put it down to a dodgy needle, cos it still runs ok, and I'm not about to thrash the beauty either. Might check that the needle isn't bent though, just to be on the safe side...