Given your criteria, I would stay at CBR. Our family loves POFQ but for a young teen, that pool will feel very juvenile. We are actually booked for our first split stay in Jan 2025 with 5 days CBR and 5 days BC. We have requested "connecting rooms, near Riviera" as we don't really care about a pool in Jan....and there is always the village pool for a quick swim if needed. Our priority is close to skyliner and dining. We also plan to use the Riv bus sometimes instead of the CBR bus.
CBR will give you such easy access to EP and DHS. If MK and AK buses are frustrating, your plan to Uber is perfect.
I would book a preferred room and put in a request for Barbados. This puts you close to the main pool, OPR dining, and a decent walk to the skyliner. If you end up in Martinique, you can just walk to the Riv skyliner and it puts you close to the food at both OPR and Riv.