That's two more items to consider. The '87 should upshift at WOT around 4800rpm in every gear. I had assumed that you already checked the tank strainer, but if not, that is definitely worth a try. If you unplug the hose at the tank outlet, it should flow fast & furious. If it's a trickle... you found your problem.