geez millbot, nice 4 minute pr! that's a heck of a breakthrough... and looks like the course to do it on, except for that pesky high altitude thing.
i've always thought that an early water stop can save two or three late-race water stops... hit the early stops systematically next time, say 2, 4, 6 and 8. gatorade for sure, and you won't feel the need to gel.
try a water stop practice race, where you grab water at every aid station. grab a cup by sticking your fingers in the top, pour out half, squeeze the top of the cup together to form a funnel, and drink without breaking your stride. be sure to burp 100-200m later. getting a gatorade should only slow you down 3-4 seconds... practice makes perfect.

you'll be beating sans souchi... err i mean you'll be getting that ag hardware soon enough!