I had one of these old EFI motors doing this same thing, long time ago, but I seem to remember that I had set the dwell to spec with a dwell meter after replacing the ignition points and it just wouldn't rev past 3500-4000. After double checking everything and finding nothing I decided to just set the points with a feeler gauge and it started to come around, I think I adjusted them from a base value of around .016" and just opened them up a couple thou at at a time until it ran best.
Also, make sure that the engine to chassis ground cables are clean and tight, take em off to clean and restack. Also had one that had a high resistance ground wire in the trigger point assembly, I was able to clean and restake that ground point and it fixed the car.
hope it helps.