Excellent idea on swapping to a Unity. I'm checking for 6 volt spotlights on Ebay right now.