I like heavy for caliber bullets, so the 200gr. partitions in the 30-06 might be something to play with before I settle on swapping calibers. I had thought though that my pre-64 Supergrade in 300 H&H might be the better platform for those.

This rifles emphasis will really be on shots under 200 yards. At least 75% of shots I take on pigs are under 100. Most pigs die with whatever you stick in them pretty quick, but I have had some die closer than I like. I had a boar die with his nose touching the toe of my boot once (was using a 5.56 AR with just 55 gr FMJ that day).