A little bit of the issues may be resolved depending on where you get the test performed. I have a guy that I take my older vehicles to that is pretty good. My 68 Cougar has the 4-barrel/manifold/etc stuff loaded on and there is not a question asked. Let us know where you plan on moving to and maybe a few suggestions for test sites can be made. You will need to have the test to get the plates, so once you have it tested you can select "collector" or regular plates. I would try the test before making any changes to your truck.
--Mike