I'm not sure which switch was the issue, but what I outlined above has completed solved the problem I was having. Absolutely amazing that such a simple fix could solve what felt like such a big issue. Wish I had tried this before I pulled the throttle body and MAF sensor and cleaned them within an inch of their lives.
Thanks to the OP for pointing me in this direction, would never have guessed this.