1. You're on the right track with respect to what to wear under your wetsuit and your T1. I tend to go without gloves but you should wear your sunglasses. Put them inside your helmet in T1 and it will only take a second to put them on.

2. The aero bottle is a good way to go and it helps you to remember to drink...since it's in your face. I've never considered a camelback...and I don't think I would. Your call on the repair stuff, if you're just looking to finish, it's a good idea. I keep my stuff in a seat bag.

Six weeks to go...still plenty of time to get stronger!