Have you seen the picture of the "modified 747" that will be used to "transport major assemblies from factory to factory"?
If Boeing could put 2 or maybe even 3 decks in that, and some windows, maybe the 380 would have competition!
(or maybe I have just discovered the way that Boeing plan to avoid critisism and test the 797) - Remember - you heard it on PPRuNe 
(Though one has to admit that it's
butt-ugly 
)