I have glaucoma and none of these symptoms "sound like" glaucoma! I would write that doctor off. My wife has had NAION and she has the wavy lines, tilted vision, etc. This usually occurs suddenly overnight but sometimes over the course of days. Did they check your optic nerve and your cup to disc ratio?