A big thank you to all your inputs and voices! I have decided...
to go with...
NEITHER!
(Well, that's not completely true. I was gonna keep the Papeete City, but I decided to let that one go too. I have an upcoming trip I need to save for and unfortunately for me, the Papeete was too much of a bright pop in color. So I have kept neither for now.)
Seriously, you guys were a huge help and helped me out tremendously. This place rocks!