Vikram,
The best thing you can do is to file your I-485 before May 1st (as late as possible). That will ensure you will not be greened before retrogression. Once that happens, you have time until you PD becomes current to marry. Make sure you apply your future spouse's I-485 as soon as your date becomes current again and before you are greened.