If your good with the overnight then your good. I will offer no recommendations on that as I would not want to influence you on such a personal matter that I have no experience with.
I think he pulled a carrot and stick on you.
Just iron out that schedule to one that you are comfortable with and do not budge on it. Only show stick on that right now. Loss of family is very important. It brings reality to his situation.
Flowers always make people better, happier, and more helpful; they are sunshine, food and medicine for the soul. unconditional love is awesome!