We've seen ARs coming from the manufacturers for a while now with M16 bolt carriers, have yet to see any with fire control components though. I personally do not see why, in your situation, it should be a problem. One of our customers bought an M16 about 5 years ago, when he took possession of it he also sold us all of his AR15 because an agent he talked to told him he couldn't have them both! I tried to explain the fault in logic, but in the end he stuck with selling them.
Bill