87 toyota supra non-turbo, runs rich

Gas mixed with What? It shouldn't have done anything to the fuel pump. More likely the throttle body, injectors or plugs are fouled

Check fan clutch does it have silicon,or replace silicon

try changing the fuel filter

sounds like u have air in the lines

1987 non-turbo: 10 deg Before Top Dead Center (BTDC) @700 rpm
1987 Turbo: 10 deg BTDC @650 rpm.

To set the timing, you will need to connect a jumper wire between terminals E1 and TE1 on the diagnostic terminal. This diagnostic terminal is located just aft of the engine compartment fuse box. It is a black plastic box marked "diagnostic" on the cover, which flips open to reveal the terminals inside. There is a diagram on the inside of the cover which explains the terminal positions. On the Turbo model, you need to remove the forward section of the engine cover to gain access to the number one spark plug wire.

I have a hood emblem from an '87 Supra in very good condition that may work for you. Have you looked on ebay?

Yes the heads are interchangable. Best way to find out if stuff is interchangable is to go to Toyota dealer and compare part #'s

The turbo uses a completely different air flow meter than the non-turbo.

it sounds like the throttle position sensor.