I like the 30-06, got three. If I already had loaded ammo, components and dies for it as you do that's what I'd stay with and hope to get a 30-06 that shot better.
YEP, you're already ahead of the game with what you have.
OTOH, if you want a short, squatty, dumpy cartridge, the 308s the one.
How's that M Mike ?
Jerry