Jetstar will receive 14 787-8 supposedly from Aug/ Sep this year- QF cancelled the 15th a little while ago AND got a pay out for it.
As they get them, A330s will come back to QF.
Beyond those 14, the QF group have zero firm orders but have 35 (I think... may be out on that one, perhaps 50?) fully convertible options on 787-9s available for delivery (as of today's date anyway) from 2016 onwards. Whether Boeing can deliver them in that time frame remains to be seen.
I reckon you're right about the 747 freighter. It's up there with the 777.