IMO it would be better to extend the follower support shelf back to its original length. It's worth noting that there are many firearms designs, including the G3, SKS, and the AK-47, in which the magazine has a metal follower that is contacted by the bolt/bolt carrier every time the action is cycled on an empty magazine, without damaging the bolt or the magazine follower. In general, there is much less spring tension between the follower and the bolt than there is between the hammer and the bolt carrier, but the hammer does not cause undue wear. Over time you may get a wear mark in the finish of the follower, bolt, or bolt carrier, but it's minimal, especially since it only happens once per magazine rather than every time the gun is fired.
The factory follower makes considerable contact with the bolt over nearly half of its length. You can see two distinct wear marks in this photo:
This doesn't damage the follower or the bolt.
I just tried pulling the follower from a factory 5-round mag and put it in one of the problem mags. It went from 2-3 jams per mag hand-cycling 3", to zero jams in 4 full mags, using the same rounds (Winchester Super-X #1 buck 24 pellet) that rimlocked with your follower. The factory follower sticks up a little higher because the support shelf extends further forward, which not only eliminates the nose-diving and rimlock problems, it also presses the shells more firmly against the upper barrel extension and straightens them out earlier in the feeding cycle, so they bind less as they are transitioning from being angled upward as they are first coming out of the mag to being horizontal as they enter the chamber.
I'll send you the mags back if you want, but I completely eliminated the problem just by swapping the follower.