MSK:....Get out of it.....any way you can and get another rifle.
The alterations likely voided any warranty;so back and forth you go on the merry-go-round.Real headache;sorry you have gone through this for $3k...a guy would expect more from them.
Get a pre 64 or a M70 Classic,send the thing to Mark Penrod to go over and make sure it works; be happy.