Its a PITA...but if it shoots that good with that combo...I'd say leave it alone, and just clean it after every range session/match day. Takes 15-20 minutes?
You can burn up a good barrel, trying to make it do what you wanna do (or at least I have). That looks to be a very solid grouping...