It may look a bit like Club Europe, but the 767s do have a longhaul version (which though a bit long in the tooth in some respects, actually is surprisingly comfortable in all cabins). Club World is the old fan dividers but it has been refitted and looks quite tidy. You're more likely to have a longhaul on a shorthaul route than vice versa.

The 747 will be New First, there is just one Old First lady out there and she won't be with us for much longer (and should not be on the MEX route marketed as First anyway).