As we need to be roadworthy to register in one month, we started the trailer electrical wiring. We made sure to add a ground wire to each fixture that wasn't there before.
Our Autolamp 575 lenses were trashed and even the replacements a friend gave us were too brittle to use. We bought cheap 7" bus lights from etrailer.com as they are the only 7" option. For our skin mounted fixtures, we tapped the bases flat, added a ground wire to the lug that was hidden inside and used putty tape to mount instead of the foam provided.
Success! Just need tires and bearings and we are road worthy!