Okay, here's the plan. Cheaper than I've been able to come up with from the first design. The batteries and charger are the two most expensive things.
Switch from Radioshack along with most of the connectors. The light can be changed to any 20W MR-16 halogen and I think I can mount that to my bike better than a home made. So if anyone else wants the plans after I'm done and do some tests with it I'll be happy to send them to ya.