Re: "Thrust over aerodynamics prize has to go to the f-104..."
104s are gorgeous. Regarding their aerodynamics, my pop was a test pilot at Lockheed during the F-104 program and told me that none of the pilots ever referred to is as a "missile with a man in it". He did hear it described as having "the glide ratio of an anvil strapped to a manhole cover", though, and did not have fond memories of the only time he flew it as a glider, flamed out and refusing to restart.
Living near Seattle, I see Boeing's beluga-like modified 747 on occasion. I don't doubt that a similarly modified A380 will be at least as ugly.