I too feel for the OP and wish him an uneventful trip back.
One piece of advice from a friend who often travels solo with a disability is never to rely on companies complying with the law or indeed doing what they say they will. Take every precaution you can personally - while this should not be necessary, and is absolutely unacceptable, she is let down on many occasions.
On top of the lack of service to which she is entitled by law, I am often surprised at just how rude or insensitive staff can be to someone asking for assistance or understanding.