I realise the above does nothing to address the problem of why the moss is forming, which I believe to be poor drainage, which could be linked to a mass of thatch holding moisture?

Would aeration/drainage be better coming later on, once I've tried to get the grass growing again?