Ban era barrels are easily threaded to their pre ban glory. By the time you find a TAT and spend the money trying to find a die I will have it done for you.
A couple of different ways to deal with replacing the FSB- I can either use oversized pins or do the "National Match" mod.
Check your PM's DOC.