I'd definitly take the connection. Aside from getting NNCW, a nice 747 and the fantastic new lounges in T5, assuming you are not tied to a schedule you have a much wider choice of flights to take.

This means precious extra hours in bed and a later flight!