Looking better but I'm unsure about the catapults. You should ask around at the shipmodels.info forum about what type of catapult these ships used - will probably give you some great source material to work from.
Here is the floatplane catapult I drew for Alaska:
I was never able to find any good, concrete information on its mark or mod or any of that stuff unfortunately. Hope you have better luck than I did.