Car: 1991 N/A Rx7

Okay so my car is still having a hesitation problem, It doesn't seem boggy through 0rpm-6000rpm but once you hit 6000-6100 it really hesitates. In first it's not as bads but second you would have to really push it for it to get to eight and I know in third it doesn't go past 6100. When I punch it in first it has a steady climb then it hits 6000 and it momentarily just stops then is really slow and sometimes it only does it at 7000 but 95% time it happens around 6000. I'm going to see if I can track down another afm to try but I'm kinda stumped, it doesn't throw a code or anything. Here's a list of stuff I have checked so you know.
Note: Sometimes my idle bounces (25% of the time) usually a difference of 300rpm, up and down up and down

Compression test-good, strong motor.
Various fuel tests such as fuel pressure, injectors- I know it's not a fuel issue
Air filter- good
Fuel filter -replaced (another past problem that didn't fix it nevertheless it's new)
Vacuum Leak Test - This I checked with a smoke machine, don't have one ($2000 machine, almost worth buying one lol)
6pi/Vdi system seems to be working, I checked the soleniod valves, there good. I don't think this is my issue although not 100 percent sure. Don't these open way sooner then 6000rpm anyway?
Exhuast- checked for clogged cat, not my problem.

Haven't replaced the afm and tried that yet, and I believe my air pump and the 6pi system is working however like I said haven't checked this thoroughly.