I'm with Grega. The are really difficult to locate nowadays. Thanks to some advice I have ended up using a 20V alt bracket and tensioner guide. Lines up perfectly. See if any wreckers are parting out silver 20v's.
WRT the water pump, just walk into a toyota dealer and ask for 16110-16010 or 16110-19155. 19155 is the updated version.