The marina has been moved as of a few years now. Just was in Aruba this past labor day weekend/week and it was fantastic at the Surf Club. We are scheduled to be there the beginning of Sept. again and would go regardless of the pool situation. We stayed a couple of days at both resorts with family and while it can work using both resorts, I thought it was just more of a hassle but again, I was with older family members. There were times when they were playing great music at the poolside bar at the Ocean Club and wished I was there so, hey, it might work for you. If you already have the two rooms at the Surf Club my thought is just to go with it - you won't be disappointed!