I’d probably shoot better too!
In all seriousness, it looks like you have your bases covered OP. I’d run what ya brung and call it a day. I like to tinker with different rifles, calibers, and load combos. My match and hunting rifles stay as they are, but the rest of it; gets swapped around after I get bored. Maybe I have precision rifle ADHD? ?
After reading your thoughts, rebarrel the win mag, back to win mag with multiple load combos, or one of the magnum 7’s would work for your purpose. Pretty well, in my experience. Bullet splash/impact with a 7 at 2000 is pretty lacking, very similar to a 6mm at 1k-1200. It also would do it with lower ammo costs vs a 338, but don’t get me wrong, 338’s rock.