I think I mostly agree but I feel more optimistic about making wrestling a little less fringe. Maybe not mainstream level but I do think the sport has potential to be a lot more popular. After all, it is significantly more popular in many other countries.
As to your other question, being a former swimmer, I actually watch swimming more often than wrestling. Having recently discovered a love for sprinting, I have started to follow track pretty regularly