I would personally go for the A380 flight too. I couldn't stop grinning to myself in the shower
I was in the same quandry a few months back and am swaying at the moment whether to use miles for a one leg upgrade on my return from PEK to GLA (9000 short for the full return). But then thinking about the benefits of the new cash+miles for future travel. Life is too complicated at times
Sure you'll enjoy whatever you decide.
Safe & Happy Travels
S