Sounds like a good if busy trip.
You mentioned that travelling on Emirates is a hit and miss affair when it comes to the old or new configurations. True, but the same for all airlines unfortunately. As airlines upgrade their premium cabins, there are always going to be the older ones in the fleet that have not been into the hanger yet.
Try and bag yourself a flight on Emirates new A380. The premium cabins are a cut above the rest. The 3 class configured aircraft have a bar on the upper deck dedicated to first and business. It is a large area with a bar to stand at and 2 couches. Try an internet search to view it. This feature halves any long haul flight time.