Definately going to hit the club store and load up.
The one in Town sells exactly the same tat, there'll be far less queues so if you have to go, I'd go to the one in Town. There's going to be heightened security tomorrow so your bag will get checked.
I've heard that big bags (whatever that means) are going to be targeted so they might only be on about ruck sacks, can't see there being much bother about a club shop bag but just thought I'd warn you in case.
If you want something a lot more authentic than either of the two Club shops, then give this place a look.
http://hat-scarf-or-a-badge.com/There was some problems with the shop after the Club trademarked the City logo, but I think that's been resolved.