Fast question.... er... long fast... oh well

Hi,
My names chris, I just recently purchased a 1989 toyota corolla sr5 for about $300. I've done alot of the engine rebuild myself as it did not run when I bought it. But funds are drawing short and I am having trouble diagnosing the problem it currently has.

I have alot of experience with the 20R and 22R motors from the RWD celicas, and in owning one 1980 Toyota Celica I have become the king of scrounging junkyard parts. I know all the toyota models that have the 22R and I know that the corolla's must have many interchangable parts between other cars. It has a 4AF carb'd motor and I have a problem with the car surging at highway speeds after a given period of time/distance.
I have checked many sources that could be causing the problem, I still have to check the EGR system and the fuel pump/filter but I want to go ahead and swap the distibutor out.

I know this may not solve my problem but in all my cars I have 2 distributors 2 starters and 2 alternators, you see these are high wear items and I like to keep spares around so if I have a problem I can just swap them out.

So heres my question, SR5's and GT-S's seem to be hard to come by in a junkyard, so what other toyotas (i.e. 4 door corollas) use the same distributor? J/W....

BTW... I love toyotas and I love hondas, bulletproof little bastards but I love rotaries the most, just my preference nothing against you guys. but any of you familiar with 12A's probably know what I mean about junkyard runs.