Final Update - And thanks everybody, you've all been super helpful!
I've resolved the hard start/smoke/power issues.
Reset the timing belt, and, once I got the IP set properly, pin in the right hole, it fired on the first crank with no smoke.
I have done the final timing with VAGCOM and by adjusting the center nut on the IP pulley. It is set to slightly advanced. I will check this periodically until I feel confident it is good.
The weird thing is that when I did the TB 500 miles ago, all was good. Timing, start, smoke, etc. Maybe the belt stretched. I no longer think the tensioner had slipped now that I have familiarized myself with it again. Note that I have not driven this car much since I have owned it, about 500 miles in 5 months. It's been a project and I'm solving one problem at a time. I think I get to start on the next one now. Thanks again!