OK... dwell set to about 28 degrees, timing is 10 BTDC, coil replaced, belts replaced, and took it for a test drive.
Not getting the stumbling at cruising speed, but still having the issue where is starts great on muffs, idle set at 800 rpm. I get it on the water, starts great right away...