I am not an expert either and your use of terms seems looks basically right. COVID-19 refers to the disease. SARS-CoV-2 refers to the virus.

There is one linguistic hair to split: You said: " COVID-19 is a general term."

I think " COVID-19" is considered a specific term. It refers a specific disease that was first identified as a novel disease at the end of 2019. The disease turned into a pandemic in 2020. Each case of COVID-19 is an incident of the disease.

I suspect historians will consider the pandemic to be a single event ... even though it was huge. I suspect that we will see COVID-19 used as the name for this pandemic. It is still specific referring to a specific pandemic.

It appears that people are now using COVID as the general term for this class of disease. I think they were using SARS before.

Some typographical systems consider the dash to be white space; so they treat COVID-19 and COVID19 as the same term.