Hi,
The Upper class suites are all diagonal ( with the ottoman allowing a dinner companion to join you for dinner).
However I think they are refitting the middle seats ( DG) on the lower deck of the 747-400s so that the divider between those seats can be lowered (for couples)
Regards
TBS