Tim,
Sounds like you're in the ball park. I would try to adjust the carb now with a vacuum gauge and see how it runs. Keep an eye on the color of the inside of the sidepipe. You want it to be a light grey. Black is too rich and white is too late, you've already burned some valves!
The question now is, how does it drive?
Paul