Thanks Charles -- looks like AB has the windshields for a good price, although the seal is almost as expensive as the glass.
Ron -- Going to power wash underneath and then drive around to see if I can figure out what exactly is leaking.
Don -- I just went with APR for the software/pulley, I did the AWE exhaust again, it's a little louder and cheaper since you can buy w/o downpipes (which are just for resonance control) on the b8.
Josh -- no digital camera but I will get some soon.
Also seems like the trailer light indicator comes on when I use the signals, anyone else have this issue?