Don't be shocked by the quality of cabin on the ANA BKK-NRT leg. ANA uses their oldest planes and a very old recliner business seat on that route. Thai would have been a much better choice on the way back again.
But who knows, maybe by October they would have upgraded those old planes.