Jon,

Thanks for your input. I agree that if the current setup is allowed to remain, re-wiring as you described would probably be best.

Anyone else? Does anyone know of any violations that I might be missing, or any hazards created, by allowing this setup to remain?

-John