Right about the numbers, wrong on the timing.
Rumour is all 50 to QF in ten years (again, galley gossip, sort of)
Actually, all up I think there are 53.
From the Fleet update;
8 Orders
15 Options
30 Purchase Rights.
Remember, there were 3 788's marked for JQ (out of 14 total) that are no longer getting the Silver and Orange.