It's crazy they changed the field around, isn't it? I didn't recognize the valley, and the two castles are awesome. I do prefer the old valley in a way, it was unique. =P
I think the vending machines are fixed, though I ordered an iced tea and get a poweraid bottle instead. Score.
The proshop is actually pretty good, the only thing is it's hard to find screws for some things. Everything except for a velocity screw for my PT Xtreme JR was done in record time, being explained to me as they went along (like when the ratchet on my A-5's cyclone stripped too much and needed to be replaced). You can probably find the right screw in a hardware store, just ask around Home Hardware or Canadian Tire.
I'm not sure if I've seen you there or not, but either way, I look forward to returning for the scenario on the 5th. =O