If you dont have an issue getting a stamp I would SBR the lower, sell the 16" barrel and get a new barrel in the length you want.
I agree with @Bacarrat that P&W suppressors make cleaning a PIA. If your stuck on it, I would do one of two options to make it a direct thread:
1) send the SDN6 in...