If I was you, before I delved any deeper, I'd establish whether it was a) the barrel over tightened or b) the fore-end was warped and twisted. A surface plate or a visual with a couple of straight-edges should quickly establish which is the culprit

Once you have decided that, you can decide your next course of action