Have you stayed at Pop since the renovation? They now have queen beds that are very comfortable. As comfortable, or even more so, than POFQ. I also like the glass shower doors as opposed to a curtain and the solid door to the sink area as opposed to a curtain. But I like the size of POFQ, and the proximity to Disney Springs, and the theme of the resort more than the theme at Pop.
I have stayed at both and like both a lot. I would switch if you are planning some resort time into your stay as POFQ has a more relaxed feeling than Pop. But if you plan on maximizing your park time, then the room and resort are less important.
One thing to note - at most of the parks the Pop bus stop will be farther away than the POFQ stop, if that makes a difference. I believe the only park where Pop is closer is AK.