I don't think that changing will make a huge difference. They are A and A- probably. IVs are important though. I only take my very best Golem into my Arcanine lineup. My second one is at 2470 CP 80% and doesn't feel good infight. Finally made it yesterday with the following lineup: (against Crunch)
Golem lvl 35,5 98%
Vaporeon lvl 35,5 84%
Dragonite lvl 38,5 100%
Dragonite lvl 38,5 98%
Vaporeon lvl 31,5 76%
Tyranitar lvl 35,5 89%