Nice work! Do you know about ToyoDIY.com? Great resource for looking up OEM part numbers. For the 85 22RE they list:
12101-35010 (08/1984 - 06/1985)
12101-39325 (08/1981 - 07/1984)
That second PN combined with the supercessions you found makes me think it should fit.
EDIT: dang it, 2 digits are flipped. So not as confirmed as I'd hoped. It looks very similar, I wonder if maybe baffling is slightly different or something. The oil pickup tube assembly for the Celica also has its own part number.