Yes, the Form 8606 entries look correct.
The "total basis as of December 2020” should be $7,000.
@psanand
