I ended up going with #2, went 1 stage rich on the secondaries, and used the heaviest step up spring since I'm pulling 21"Hg at idle, and it was a massive difference.
Unfortunately when I went for a drive it was sounding like a diesel there was so much valvetrain noise, so I adjusted the...