I misspoke. The bargain element (the difference between the ESPP employee price and market price) is added to the W-2 on sale, not on purchase. Your treatment is correct.

It is the RSU that bargain element (the difference between the purchase price which is 0 and market price) is added to the W-2 on purchase.