Linn or rega

I have a 1980s Linn LP12/ittok with valhalla and sumiko BPS. Sounds cozy and nice but I would like a bit more clarity without losing the analog glow.Would a rega P9 with RB 900 be a good upgrade or should I get the cirkus upgrade to the Linn.
BTW I am looking to replace the cartridge as I find it thin and bass shy..