Have you considered getting a software package that would help with all of your secene controls? I use all 2-way switches with scene controls in my how too but I automate them with HomeSeer. It really makes life a lot easier.

Martin
www.AutomatedOutlet.com