I think that you have already done the most appropriate thing - find a new Neuro! I just read the Mayo Clinics' definition of Occipital Neuralgia. I don't think that your symptoms are a match for the diagnosis you received. Some Neuro's know too little about headaches. That is why they have headache specialists in Neurology. Harder to find, but much more informed.
When I first began my adventure with CH, my hits lasted 20 minutes. Over time they increased intensity and duration and today last 2.25 hours. I am ECH. My cycles are pretty regular. They begin with one hit per night and ramp up to 4/night. So, with one hit at night for a couple of days, I pretty much know that I am going into cycle. Or if i drink a beer an get a hit, I most certainly am back in cycle.