It could be that part of it is a mixture issue.
A quick look at the cam specs, if I was curving one for you, with that much gear, I wouldn't bring it all in till 3400.

You can do more initial, than where you are at. I think your starting at 18 was probably ok.

I think 18 initial, with 34 total(16 mechanical), all in by 3400 would be a good start.
Then do some plug reading, and see where you're at with your mixtures.

What converter are you using? that cam would seem to like around 3K or so.