Perish song+recover+u-turn Celebi is quite possibly the best way to beat sub+calm mind Jirachi. Why do you want to change that set? Now that I think about it, storm drain Gastrodon with earthquake is another solid counter for both CM Jirachi and bulky waters in general. It doesn't learn momentum moves though.
<ginganinja> can I add Pocket
<ginganinja> to his own blacklist
Join this group
if you're interested into joining Team Italy for the next World Cup of Pokémon.