[V8] 3.6 convert to 4.2 and other silly questions.

[chris brown]

Hello, i finally for the engine delivered to my mechanic last week and i popped in to see how it was going on Friday. Much to my surprise i was sent a 4.2 L V8 for my 1990. (automatic)i had specifically asked for a 3.6 but i was told the boys in the yard must have made a mistake. He isn't going to charge me the extra$ 400.00 he wanted for the 4.2, so i got it at the cost of a 3.6L
 Im sure many of you guys here have done this upgrade and my mechanic has some questions for me to post on this forum. He's a good mechanic but has worked on Audis for decades, but never swapped on engine on a V8 on a 1990 Audi because the car is quite rare as we all know. 
 Chris at force 5 told me everything is the same and it should hook up identical the same way the 3.6 does. Is this true? Manifolds, computers, and all the hoses, and connections are the *exact* same? I was just wondering if you guys had some tips to do this job that i may relate to my mechanic on Monday AM when he starts this job.His price to me was $1200.00 in labor approx. Does that sound fair? (plus parts).
 On a different note, i'm looking for a set of rims for her. i have the original (ugly white) audi rims that came with the car. I'd like to upgrade the rime to BBS or something like that. Does anyone here have a set for sale by any chance. The car has 15" rims i think thats what they came with. Im just going to use the ugly rims for my snow tires and put my street tires on my new rims. 
 And i have one more question, the price my guy gave for all the timing belt and water pump stuff including bearings, and rollers,  tensioners, etc. was too high!! He said all together it lists at around $950.00 for parts for the kit. Isn't that way to high?  Where can i get a better quote for all the related parts to do that job? 
 i know i'm a pain in the rear end, but I've been a Audi fox and Quattro guy for a long time now, but this is my first V8 and i just need a few tips from guys who know their stuff.
 thank you so much guys, i really get a lot of good solid info from this forum.     Chris1990 V8 4.2