If you have the tax stamp, you can use any upper you want. If you no longer use/have the upper making the firearm an NFA item, you should, but to my knowledge, is not required to contact the ATF. This is covered under several other threads, most recently here.
You should probably close/merge this thread.