Instead of adding the carrier TMOD from SPAW, which have none of the AA guns or radar TMOD's stacked up on the carrier island, how hard would it be to include an entire carrier squadron?

This would give you not only the stacked TMOD's but also the screening destroyers and cruisers.

Since each target is contained in a separate file all you'd have to do is add the appropriate TMOD's to the CAW folder and then use the target editor to add the new data to the existing target set.

Just a thought.