Excellent points. Mind, the post-Midway Japanese made due with conversion carriers that were not much better. Give Courageous and Glorious to the IJN and they'd be happy enough. Though they'd probably extend the flight deck in a light weight fashion, like on the merchant conversion carrier Kaiyō, shown below.
View attachment 786970