Big fan of POP here. But CBR would be my choice between the two.
Much better dining options, love the small pools, it's a beautiful resort with great walking paths that are wonderful in the evening (and now that the parks close so early that will be nice), the two Skyliner stations means direct lines to both parks.