Calum I would not be so certain. This thread is about Operations in 2018 not 2017 and I would expect the refit to be finished this year.
purple1addicts post on
http://www.flyertalk.com/forum/qatar...es-2018-a.html that you refer to is about 2018 and
jbflyboy84s is about 2017, probably May/June. While it is extremely unlikely it could even be replacing an A380!