RE: secure batt and rx?
If you don't know how to solder very well I would not suggest messing with the switch. Too many planes have been lost due to a faulty switch. One thing I would suggest though is to apply a little epoxy where the wires go into the switch. This will reduce the risk of the wires getting loose and pulled out.