Wow, sounds like you managed to get a decent amount done in a day. I think that would have stressed me out. Totally agree about Once upon a time, that felt like a huge mis-fire.
I also found the merch to be a bit limited, but at least they had ride-specific merch (something I wished Paris had...