Need help on some bolt sizes (22re)

Need help on some bolt sizes, Motor is a 94 22RE... I need to know if anyone knows the thread pitch and length of the water pump bolts, They are no longer available from Toyota, And I also need the thread pitch and length of the 3 longer bolts in the oil pump, Toyota could only get me the shorter ones, and I cant wait another 3-5 days for them to get the other ones.