I'd be curious what some Tubbs Final Finish would do? I assume the crown is fine and the stock isn't making inconsistent contact. Or, just rebarrel it like you said and be done with it.