I'd wait. You never know if the second charge move for PvP will unlock new charge moves as well, or only out of the current pool. Everything could change if that happens.
Niantic also listed in their goals as making TDO matter more and DPS matter less for raids. So I'm curious how they'll do that and it may be worth considering - however once we know for sure about the second charge move I wouldn't keep waiting for that update.