2005 Mini R52 Non-S

I have a very rough idle, here's what I've done with no success.

Smoke test, found 1 injector leaking, replaced that injector.
Smoke tested again no issues and no leak, tested from both the line leading to the power booster and EVAP leading to the tank.
I've bypassed the brake booster and power valve, no change
Replaced the MAP sensor with 3 different sensors, no change,
Replaced the Bypass Valve, no change.
Replaced the throttle body, did the relearn with my Snap-On scanner and the standard 90 second relearn, no change.
I'm now lost and really need help, what have I missed?
Thank you in advance for and all advise, Terry