I'd buy another upper in the configuration you wanted, then I'd have one that was legal for highpower competitions (and in the exact shape you bought it in, thinkin of re-sale later) and one for plinking/long range or whatever your intended purpose.
Mike