I would leave it a 25/06. I really can't see changing into anything other than a 338/06 or 35 Whelen. A 9.3x62 is probably out with the 400 yard shot requirement and there are 30/06'S everywhere. If I wanted a 30/06 I would just buy one.
Why not sell the 7 Mag and take the barrel money to update it?