I had the same problem with M and I just endured it for a few months till he realised it wasn't so bad. Sorry maybe not the advice you were looking for but I am sympathetic to your issue