What to do?
It really is very easy. You are in London....book a direct non-stop flight from London to Tokyo and forget trying to save a few bucks with a connecting flight...as you have seen, saving money is not always the best route to go, pardon the pun. Qatars ground service is horrible, always was and probably always will be.