The rewiring ordeal is finished. All of the house circuits have been rerouted to the subpanel except for the big loads. Eventually the machine shop and the hot water heater will be moved, but this is sufficient to get all my circuits working again, and to proceed to the final wiring and start up of the inverter and charge controllers.
Was nearly a week of work to make it happen. Murphys law, things always take a lot longer than you first think they will.