Whatever you do be careful. You don't want to mess the threads. I would wait for the barrel nut but I put my money that the problem is in the receiver. I would be surprise a McGowen barrel was threaded improperly. You might have to visit a smith if only to have him look at it. Messing up the receiver or barrel threads will cost you more. Good luck, wish you were closer so I could help better.