Heater Core R&R - flap positioning and parts suggestions?

[Bares, Vittorio]

Hi - just took out the heater core from my wife's 95.5 Avant S6.

Wasn't as horrible a procedure as I'd expected  - used this pdf:
http://12v.org/urs/C4UrSHeaterCoreReplacementDIY.pdf

based on kinderutz procedure here:
http://forums.quattroworld.com/s4s6/msgs/16189.phtml

Clearly didn't read to the bottom as I was so excited to get the assembly out of the car in under 1.5hrs - so split the assembly and took out 2 of the flaps :\

Is there a procedure for aligning the flaps when I go to put these back-together?

I'm intending on ordering the parts from genuineaudiparts.com - but the fan is $222.46 - is this the best place to get the blower fan? I've seen Meyle at half the cost - but would rather not have to do this again, and $100 seems like a worthwhile amount if there is a fundamental difference between the quality of the products...

TIA!

Vittorio -