This is all really good and helpful advice. You guys are great. Thanks.

I will probably do the cams in conjunction with a bigger bore and maybe head work down the line sometime. I can't really justify the expense ATM.
Meantime I think I will gut the air box, get some new Magnecor plug leads and plugs and get the girl tuned. This will at least give me a baseline for when I make further improvements. And I will definitely drop from 18 to 17 teeth in the front.