Fanfare. Your suggestion is also thorough and correct. I did this last year. However it is important to report box A entries with adjustments in form 8949.
It turns out if you purchase TT Deluxe desktop edition instead of using the online forms, it does this for you and allows for edits of the form directly that are easier to make. Forget the online version if you have lots of entries to make.
