A little late to the party, but I thought it worth while to link to the proper tool for the task at hand. If you're doing a LOT of work with the motors one of these Tamiya pinion pullers might be worth your money to avoid damaging motors.
Coop, I must tip my hard hat to you. When I started reading the only thought i had was "WHY!??!" then it started making sense. the gains from using the Rayven as a stock are far greater than using the Stampede, and i salute you, sir. A bit more elegant than my own mag holder stock solution too.