That's right, the 380 is certified for over 800. As I understand it (yes, just a runor)Singapore is looking that way now.
Here is a thought. Boeing won't stretch the upper deck because of restrictions on belly space (my guess). Basically, you have two 777's worth of people with the belly space of one airplane. I remember a show on Discovery with an ex Boeing engineer saying that there was a reason that Boeing did not go with the original 747 design, which looks very much like the 380; he said there was a reason they went with the bubble instead of the full upper deck. The understanding being the lack of belly space.
The unfortunate thing here is that the industry needs at least two fit manufacturers. The path that EADS/Airbus is on is not good. The A320 is a nice bird, but the new 340's are dog's, they don't really have competition for the B777/787, and frankly lets be honest, the A380 better work (what's the likelyhood of that?) or they are in bigger trouble then they are in now.
When was the last time someone ordered one of these thing's? The last time an order was cancelled? Not good.