I wouldn't change a single thing about the OW class I teach. My classroom sessions have No video. We active learn and participate. We learn tables And computer use.
My pool sessions require the repetition of mastered skills, (for example, my students have cleared their masks over 80 times before they are done). My skills include equipment bailouts, basic rescue skills, and skin diving skills already. They practice until they can affect self-rescue, and problem solve. No skill is done on their knees.
In the sea, they never touch bottom. They know how to descend and find neutral well. They perform all skills at horizontal in mid-swim. They have to completely navigate on dives 3 and 4. I am their instructor, not their leader. I am there to supervise, not baby them.
So, I don't think I would change anything at all. Oh, and I won't have more than 4 at a time, and 5 is our max, unless I have my husband-and fellow instructor- team teaching. We actually are both in there all the class anyway. We make a damn good team.