It's a good thing you're keeping that upper in your house in PA until all the compliance work is done.
Pick up a muzzle break ASAP and drop the upper off at the gun smith to remove the old flash hider and pin/weld the new break and also shave off the bayonet lug. After that, the upper is clear to come to NJ and sit next to the lower.
For the lower, you may be able to pin the stock yourself at home while the upper is being worked on. There are numerous ways of doing this, all of which do not require that much skill. Read this thread.
http://njgunforums.com/forum/index.php/topic/49840-pined-stock-question/