So I was finally able to get it to work as well. What I found is that it still does not work if you select "I have all my info (like adjusted cost basis) and can enter it on my own" as you enter your ESPP details. Following that path gives me the same problem as before where the ordinary income never makes it onto Schedule D.
However when I tried selecting "Walk me through adding more info" and followed that path it worked correctly. So if you're still running into the issue try selecting that option as you walk through your ESPP sales and see if it works for you too.
