I would not wait. If you want to be in the Haven, I would definitely upgrade myself for the $200 difference. You have no assurance that the price will drop and others on your cruise may snatch up the remaining Haven suites and there won't be any left. Also, if you book the Haven outright, you will receive 2 latitude points per night rather than 1 point.