Go for the grand villas. Everyone seems to love them and even with the extra $$$, they are still cheap. We are staying at Wyndham, but we are locked in with a timeshare tour, now and I know you don't want to do that.
Even if there is a slight chance of getting a less than great room at CP resort, that is enough chance IMHO. I can tell from your posts that would not make you happy.
Between the Wyndham and the grand villas, I just think that the volcano pool sounds really great. Maybe next time we will do a CPGV.