The clack of death!!! Know it well we do. Time for the flybar mod my friend.
See Soloboss guide http://cx2.r-2.nl/ as well as this thread that has some good coverage on doing the mod http://www.rcuniverse.com/forum/m_63...tm.htm#6397033
Of course please see us for any questions
Missed the last part of your post. You will need a new battery tray. Your LHS should have one or online. Lots to be found.
If your battery tray isn't too busted up have a look at this thread to modify it vs. buying a new one.
http://www.rcuniverse.com/forum/m_6504240/tm.htm