I believe that you are mostly correct, emphasis added by me.
Visceral fat or abdominal fat[ (also known as organ fat or intra-abdominal fat) is located inside the abdominal cavity, packed between the organs (stomach, liver, intestines, kidneys, etc.).
Ectopic fat is any place other than adipose tissue, so it reads like visceral fat is a sub-type of the more general term, ectopic fat, if I’m reading it correctly.
Ectopic fat is the storage of triglycerides in tissues other than adipose tissue, that are supposed to contain only small amounts of fat, such as the liver, skeletal muscle, heart, and pancreas.