Instead of "major major" dividing of the switches and circuits, can a lighting contactor be inserted such that the switches control the contactor coil and the contactor powers the fixtures? This would remove the fixture current from the switches and would require minimal rewiring.
Just unsolicited advice from a non electrician engineer.
