I think I've got that right.
When I'm singing I'm more restricted. I can have my espresso but only if it's maybe an hour before I sing. No milk but I don't have milk anyway. But no soy milk because it's too filling. Definitely no chocolate! I can have a little tea but again I have to know what it is and not overdo it. Generally I have something neutral like ginger tea and lots of water.
I've been working on my piano repertoire to put together a programme I can take around. I've got some interesting classical tunes but need to work on lighter stuff - nobody wants to listen to a Chopin etude while having drinks, but a nocturne is welcome with the right crowd.
I'm also looking at the songs I know that I can play myself. The demand for this is very low. I'm actually better off with a CD player and a karaoke microphone. Grrr!