That's ok TA, glad I could help.
Keep the same catapult and crane all through the series, just update the planes.
Replace the 3" by the funnel with a bucket of 1.1" AA for 1939, then replace with twin 40mm for 1942 drawing - add some single 20mm to 1942 drawing.
Oops! I credited the wrong person! Sorry!