The WL is my favorite hotel, but only if I'm staying in the villas. The rooms at WL are VERY small IMO, and we acutally went through the same thing on our last trip. We were booked for 2 nights in a Woodsview room and were getting worried that the room would be too small, and staying in such a small room would "spoil" the WL for us. My DD LOVES the Poly and the monorail, so we upgraded to the Poly for the monorail convience and the larger rooms. I'll stay at WL again and again, but only in the villas, due to the size of the rooms. We always stay for 10 nights in the summers, so we always split our stay between a monorail hotel and a DVC resort, since we're DVC members. If I were you, and money really isn't a problem, I'd switch. The Poly is just so convient in it's location and the monorail is GREAT!! We're debating between the Poly and the GF for next summer, but the Poly might win out since we LOVE the concierge there!!!