we have the same problem with our little man- we have moved the bath into his room and try to keep his favourite toy nearby. We chat to him and smile a lot to reassure him. He still gets a bit upset afterwards when we are getting him dry but seems better than when he was in the bathroom- think it was just too cold for him in there, and alien- afterall he was never in there except when having a bath, whereas he is in his room everytime we change his nappy!