Take the A380
The new WTP is such an improvement on the older version. If it were me I'd be on the A380 without a second thought. The head rests on the older version stop me being able to sleep in both WT and WTP.
I'm thinking of changing my flights to India from arriving at DEL or BOM to HYD to take advantage of the new WTP on the Hydrabad route.