Yael - drop the swimming lessons for now. Starting school will be enough for him next year. If you want him to be safe in the water I would suggest just hanging with him in the water yourself to help with confidence over summer.