Your situation sounds similar to mine. I am in the middle of tacking down the contract and itinerary as well. Are you using Planner1Events for any extra stuff? Are you using the resort DJ?
I did a site visit at Secrets and met with Cecilia and Ismael (the DJ) they were both so accomodating, they even let us do a menu tasting! We also did a site visit of Grand Velas RM and the property was nice, but service was lacking compared to Secrets.
I am getting married April 29....I just emailed Juan Navarro to see if we can just have all the pics on discs and work something out separately, I also emailed to Cecilia to see if we can use that credit towards something else....