I'd look at a bigger Cambridge. Don't go too mad, but one of the "Azure" models should hopefully improve on what you have.
The 2r was an attempt to get more efficiency from the cabinet, so the mid was lifted in level and it appears the smooth, utterly "musical" and beguiling sound of the originals was traded for a leaner, more forward "flat earth" balance.
You could stay with the Cambridge A1 and upgrade to a P3 instead...