Have you considered Coronado Springs? We also stayed at PO several years in a row and absolutely love it there. But last year we decided to go to CS and I was pleasantly surprised! I don't love the Mexican theme quite at much as PO but the resort was beautiful, clean, awesome rooms and nice queen sized beds, and it seemed the least crowded and secluded of any resort I've been to.
Just a suggestion.
I really don't love Caribbean Beach unfortunately. The pros of the brightly colored buildings that some posters are talking about actually seem kind of tacky to me. And I will agree on the busses being the worst.
However, if it was my only choice of corse I would still go. It is clean and in WDW, everything else is gravy IMO.
Oh and make sure you come back on here and update us on what you thought when you get back!