Pff, if you want to infuriatingly neuter an enemy CV accept nothing but the best
No, but Seriously Shoukaku wins. Hiryu can fight Kaga and once you add an extra tier on the planes, defenfisve AA, and more HP and torpedo damage reduction it's not really a contest.