tried cross matching, toyota is useless they dont know a battery form a gearbox.
You'd be surprised how good Toyota is if you give them enough info.
Look on the waterpump, is there a part number? (I'm not sure if waterpumps have them printed on them, most other parts do somewhere). If so, just order that part number.
If not, get yourself an EPC, and check every car the 4AGE came in, try and match your with the pics.
This will give you the part number.