Hobby city has also gotten the KB36-74-09XL 1900kv back in stock now for less than 30 clams....has great reviews. The KB45-08XL 1700kv is gaining popularity from HC for under 60 bucks. Lots of buzz on the forums about it. A real honker at 45mm it has a 6mm shaft and insane power. The 09XL has a 5mm shaft but has the same mounting capability as your Fiego 25mm...the KB45 is a 29mm.
pinions for each can be found at
www.kershawdesigns.com
5mm only at
www.liquidrc.com and
here too of course.