So we are probably looking at May if all things go well - correct? If not, then probably June or later?

I should have just installed 6.16 and been happy with that. This waiting stuff just never ends.