We are in the same position for our upcoming February cruise except we are in an angled club suite. For us, the best part of the Haven is the restaurant for dinner. With four specialty dinners, we would only be eating at the Haven Restaurant twice (eating poolside during the Superbowl) so we are passing on the upgrade chance for minimum $400 a person.
It would end up costing over $1000 with the additional tips and we will not give up our Vibe cabana as the Vibe is, in our opinion, a better overall experience. Also, in the past our Butlers have not been that impressive so we will not miss that experience.