If it's to windy there shooting a 17 Rem. and 25gr. bullets out to 250yds. or the 30gr. out to 300yds., then what did you replace it with that those heavy winds didn't affect? The 17 Rem. and its many variations is used a lot out West where its almost always windy.
I've been shooting a 17 Rem. for 41yrs. and when it got so windy I couldn't use it, there wasn't anything else usable either.
X2
Couldn't have said it better.
As for your CDL, wrong bolt face for the Hornet, and I'm not sure anyone's ever converted a M7 to extract a rimmed case (not to mention what an endevor like that would cost) so forget that idea.
If you plan to reload anyway, what's the worry? Reloaders have been shooting the original MK4 for over fifty years without a problem. Truth is, there ain't that many choices for factory ammo now anywho.
Leave it as is and enjoy.
They're great little rifles after a little love.
My buddy down in NV bought one that shot OK but not great.
We floated the barrel, bedded the action, and put an older 700 trigger I had on hand in her, and it now shoots right with my P-N barreled CZ.
We call em the "Dueling Fireball's".