I can't say whether there will be 380s flying again but I suspect if they do fly, it will only be the re-configured aircraft.
Also, considering the hundreds of engineering staff to be made redundant, the capability to service a full fleet will also be diminished. Sydney I hear are losing 300 from engineering and over 600 in total across the group.