I already have a pinion puller from my planes and its the best 14 bucks i ever spent. Its definitely a tool worth having even if you only use it once. I actually thought about changing pinions like you said but I guess Ill try fly it stock 1st and when something breaks Ill toss on the goodies