Adjusting the choke today and took some timing readings while I was at it. My fast idle cam was not producing the 2000rpm as recommended so I still need to do more adjustment there, but at least the throttle rests on the high point of the cam when the choke is closed now.

800rpm base idle - 10* initial advance, 13* adv with vacuum attached
1200rpm mid cam position - 19* initial & mech adv, 21* adv w/ vacuum
1600rpm fast idle position - 22* initial & mech adv, 24* adv w/ vacuum