Do I need a choke?

Post #13. Backing down the initial because it gives too much total is the WRONG move. The RIGHT move is to give the engine the correct timing at idle [ which you found was 22* ] & modify the dist curve.
I have been through this in the last few days with a big cammed 440. It idles best with 45*. Trick Flow heads, 10.5 CR, no idea what they need for WOT, but set up for 34*. Initial is 26*, dist curve adds 8*, vac adv connected to manifold vac adds 19* at idle. 13.5" of vac @ 1000-1100 rpm.