It isn't up to you to take care of him now while he says he is done. You gave him the schedule, he is a grown man who should be responsible for taking care of it from there.
Bringing him shampoo...there is a thing called a telephone and he could have called housekeeping for more. You are rescuing because you always have. This isn't good for either of you. He needs to see what it is like without you helping him along.
You need to let go a bit. It is like wet soap, you hold on too tight and it is bound to go flying out of your hands.
kat
Me-53(and learning!) S24, S21, D18, D17 Just keep swimming, Just keep swimming. Dory