Yeah a good tuner friend of mine recommended
http://www.nickersonperformance.com/ so I sent them an email. My friend doesn't do carbed motors and that's who he sends everyone to who needs that service. They do tunes and build carbs and make cams as well. So we'll see what he says!
I'd be great to still get some nice power out of this motor, even if I have to change a few parts around!