I would personally don't power anything up until gym rework just in case. If you already have a ton of dust saved and need something to stick in gyms then you can go for it, but if you have a good amount of attackers and defenders there is no point to spend dust knowing that a gym rework is comming. Maybe CP is no longer king and you find yourself with 3/4 high CP Gyarados just for attacking when you will never use more than 1/2 on the same team. No way of knowing anything yet but I prefer to be careful, Niantic has screwed a lot of us before with cp/attack changes...
Anyway until pvp comes out and we start to measure against other players in real time I think there are no "good" or "bad" choices, just personal preferences.