find a local toyota dealer that will give you a 20% shop discount.... tell them you have a repair shop, 1/2 the time they won't even ask for proof. if they do, go register a d/b/a for like $10 or whatever at your local city hall. it's well worth the time and effort to set up this type of account. i've probably saved $500 or more from my 20% toyota discount.
i bought a new fan blade and shroud from the dealer.... don't cheap out. i drove without it for 1 day and it did slightly overheat in slow moving traffic, so i stopped driving it and ordered right away. i considered getting dual fans and ditching the fan blade/clutch, but i read a lot of posts with people who were unhappy with their electric fan setups.