Not sure about astigmatism and wavy vision. Judy2, mentioned migraines, has your neuro or anyone mentioned that possibility?
Doesn't sound like any optic neuritis flare up I've ever had. And I've had several flare ups of that. That's, for me, usually a piercing headache, loss of vision for weeks, and it's temporary legal blindness, when I've had it. Fortunately, it, for me, when I have it, only affects one eye at a time.
Hope you get some answers