I recommend doing what @teksplorer advised. Yes, it's stupid that we have to, but I want this done with. Now that my ESPP and RSU transactions are available for import from E*Trade, I started over, deleting everything I had put in my original and "draft" forms. I imported everything fresh, and didn't have any issues with the RSU transactions. With the ESPP's I updated the forms manually and everything matched up. I only had 3 transactions so it wasn't a huge drag. It got a little nuts because the company stock split in the middle of last year and the 1099-B has the original numbers and the 3922 has the adjusted for split numbers, but I just went with the 1099-B as that is what is reported to the IRS and used the release forms for the 3922 info.
Phew! Now I have to deal with a disaster of a 2 year old ISO payment...
