If you are sold on upgrading to a mod for the dining plan, then go ahead and go for it. I don't think you will be disappointed in CSR. It's beautiful day and night. The Dig Site pool is GREAT. The rooms are very nice; I love the bathroom area sliding doors (vs the curtain). The Queen vs Double isn't much of an issue for me. I've stayed at POP many, many times (and will again Dec 12-17!) and have also stayed at CSR. Personally I'll stay at POP over CSR, but that's personal. The bus stops (@CSR)are quick in my opinion(with the exception of loading/unloading ECVs). I stayed in the Cabanas section and it was a pretty good trade as third stop in, next to last out. And if you arrange your departure through El Centro (a lovely walk from Cabanas and Casitas) even better! POFQ is my personal fave mod, but the CSR bus route feels a lot faster when compared to making ALL of the possible POFQ/R stops. Again, personally I think I've only made ALL of the PO stops once or twice and never when I was on a deadline. Food: I am one of the few who can not stand Pepper Market. Great idea, poor execution. I mean, I really, really, REALLY dislike it- so if resort food options are an important consideration during my trip I will always rule out CSR. I don't think you can ever "mess up" a Disney trip, so go with what works best for you in the big picture and don't sweat the small stuff!