As much as I'd love to see more A380 orders being taken I doubt it due to the limited number of routes that these a/c can operate.
Although I think we all loathe the 767s in their current form, I believe if the right amount of investment, in the form of extensive cabin replacements, was put into the a/c I think they could continue for a lot longer without any majors complaints from us lot.