I agree that OW has enough material to cover, but what about AOW? Shouldn't this be one of the core modules like Deep & Nav? Unfortunately not everyone is as observant as Lottie or as intuitive. There is a swimming requirement for OW to make sure that all OW divers are at a minimum standard in the water. I've had people tell me that they were "very good" swimmers & they were! Very good "doggie-style swimmers"
As for putting it in another optional class, is there anyone who would really sign up for, pay for and actually admit that they needed "remedial" classes? Wouldn't it be better to make it an official part of the curriculum so that is has to be done?!
It's not so much about going in first, as it is about getting back out. Just going in is the easy part no skills necessary there! But going in in such a way that you can easily get back out - that would be the wreck/cave course. It's about safety not about who's got the prettier fin kick.