Agree with the A6M5 subbing for the A6M3.
Were the Typhoon, and Tempest even used in the PTO? I'm not sure but I don't think they were. Drop them, and possibly look at limiting the Spit models to the MK IX as the latest version allowed. Then you wouldn't need to sub for all the missing Jap rides.
The N1K2, Ki-84, Ki-61, and A6M5 , would match up well with the Spit9, SeafireII, and Hurr II's. Use the TBM , and Seafire on any British CV's your planning on including. You could also use the Hurri I, on CV's. Possibly base the Spit9 from CV's the last week to represent the SeafireMkIII.
That might keep the setup more to the Commonwealth/ Imperial Japan setup your looking for. If you throw in a bunch of USAAF/USN , and Luftwaffe birds , your going to have a bastardized ETO. Or maybe a PETO.
These are just ideas , others may have more info on aircraft availability , but simpiler may be better in this case. Justa thought.