A good summary Pepin!
Somewhere in there you need to centre you're steering too (just before the main gybes over).
I'm afraid I'm slightly in the 'S' turn camp as keeping the pointy end up is faster overall every time than doing fast gybes 4 times out of 5 and then an occasional swim!
Having said that, it's not any sort of real 'S', it's more of a shallow 'C' with a little hook at the end which is solely to stop the main powering up and tipping me in......