I voted for both and the idea of reduce the cooldown is awesome.
But i have a dude.... if you can increase the attack, def, hp, special attack like spells or something else you need a specific amount of points for balance the pokemon, maybe your pokemon could be very power but could die in a...