I would stay with the crit + spelldamage. And if you do grind for the haste gems, then sell them to get your epic flyers!

-Jungle love