Great plan! ('cause it sounds like just what we did!)
We have stayed at POP since we first went there, you want the LADY building, some of it is preferred (but if you want to save a little more $, just ask for the LADY building and bump down to non-preferred) and some of it is standard, all in the BEST building - super close to the main building , right in front of the bowling pin pool.
We also always get the water park and more, but we usually stay over a week, so we dont get park hopper. The water parks ROCK! and we also love DQ. We usually go several times during our stay, I think last year we went a total of 4 times in 12 days to BB and TL, and DQ at least 2 times as well.
I think you made a great choice! The bus system is one of the best, very quick usually, especially getting home, which is key.