^^^agree! I would also add (don't mean to bonk you over the head again but you have an amazing chance to show a new improved you, so let's take it!):
Notice how you were so concerned about him-- when will he eat lunch, does he need a towel? Almost as if he was a child. But he's a big boy and either he will figure it out or deal with it. Cut that cord. Try to notice when you start mothering him at the beach (offering him something, etc), and try to stop yourself and just let him be. Don't remind him to put on sunscreen!
But ask him to put some on your back with a wink! ;-)
