If you are sticking with BA, and have the option, I'd go out Club and back First. I quite enjoyed my flight back from Tokyo in F. I was expecting it to drag, but it was actually quite pleasant. Dozing, eating, drinking and watching films and the world go by.