Glad I'm not the only one in the same boat. My ESPP provider was not E*Trade so I did not have the adjusted cost basis column in my reports.
I did have to adjust my cost basis using the 3922 forms because the 1099-B just had an aggregate number that was incorrect. Again I just used what was reported to me and did not adjust anything further.
I also adjusted my W2 income based on what was added for the bargain element.
