Not a bad idea...
On the DDs, the FCD was the Mk 37, using Mk.14 radar and later equipped with Mk.22 height-finding radar (the small banana-shaped array on the side).
On the CA (yes, Baltimore class), the 8-in guns were controlled by a Mk.34 FCD using Mk.8 radar. The 5in guns used the same Mk37 FCD with Mk14 radar.
For late war IJN CVs, its tough because there were so few class-built ships, most were one-offs developed from previous ships...Shokaku and Zuikaku were about as close as you can get to 'sisters' in the true sense.
That being said, Unryu would be the most likely, as she was essentially a repeat Hiryu and had 2 other sisters. The downside is that the only true fleet carrier to see any significant combat after Zuikaku and Shokaku was Taiho, and even that wasn't a long career. Unryu's sisters Amagi and Katsuragi never left home waters.
When it comes right down to it - we have only a couple of choices - go with another US design like a CVL or CVE (which could tie in very nicely with the amphibious assault group), or go with the British Illustrious class CVs. They'd certainly be able to take more damage than the current 'Essex' we have.
Amphibious groups with LST, LCT, CVE, DE +1
Detachable DDs from CV group +1
(sorry about the images - they're not mine. I'm just too lazy to scan and post them myself.)