Sounds like you have your power system all sorted out. I am almost done with my airframe. I am using the Fremeco Wolverine switch. It has redundency built into the switch. I am using 2 2200mah nicads.
http://www.airwildpilotshop.com/More...product&id=702