Composition of Your fleet looks better now, indeed.
Note, hovewer, that 2 CVH's don't mean You have 2 Task Forces to deploy at all times, merely that You can possibly have them during the war (from time to time). In peace time it's one TF deployed, one at port/training/maintenance/refit etc.
As for the size of the CVH's, if You want them to be 40000t, then ok, why not.
But perhaps for an ASW heli carrier (or essentially heli cruiser) half of it could be enough too, esp. for a country that size (then it would be about 650 ft long, I guess).
Having a combined heli carrier/through-deck cruiser would allow You to drop cruisers (but that's Your AU and Your choice, of course
).
Also (though I may not remember it correctly - I'm not at home right now, so I can't look into materials I have), I think that - at least in 1980s/90s US Amphibious Ready Groups were escorted by only about 2 frigates (without destroyers). After all for a deployment they would usually sail with main task force anyway.