Unconstitutional laws are not laws.
I'd shoot it before making any changes. Just to make sure it's going to do alright.
I'm not certain what to think about the barrel. I'm assuming the entire barrel moved when the piston started acting up, and the extractor wasn't seating properly?