no problem, i wouldn't even bother putting in the new servos till you get the switch. I think my stock one shorted and and caused the demise of my second stock servo.
this is the one I am using. I like it cuz it has a built in charging port.
http://www3.towerhobbies.com/cgi-bin/wti0001p?&I=LXPNU3
And im still using the stock radio and failsafe.
Stick with it, i was getting annoyed with the problems i was having with mine but once i got the steering servo issue worked out i've had a blast.
I did finally melt down the stock gears but i was drifting around the local rc tracks oval course for 15 minutes straight lol