Another, even simpler idea:
Buy an extra upper barrel/receiver combo (either 4" standard or 6" navy) and shoot with that instead. This original resistance-rework barrel/receiver combo can then be stored and kept as part of the gun's history.
Best of both worlds, so to speak