If you can't hack the Energy drinks, I can't, strong coffee works well for me. I keep it in the fridge.
Left to its' own devices, I am purely nocturnal. Yes, it makes you hate to go to bed! Scary just thinking about it some days. I wind up sleeping in the mans recliner in high cycle as it wakes me sooner when I get hit and and I can avoid some of them altogether that way if I hold my something just right. Not sure what it is, but some nights I can skip one in the chair and that is nice.
It sounds like you are seeing good results here, am I correct? How do you feel about the results?
The addition of Benadryl will be a nice help. I take it in the am and at bedtime I take two, as directed. In the am, just one so that I do not feel sleepy.
Melatonin can be a big help too for many. Not at the 3mg dose though. I would suggest starting with 10mg. You can work up to 25 -30mg if needed. I do recommend caution when doing both if you are not accustomed to either of them. Just to be safe so you do not find yourself stumbling in the night. With that in mind, if they are new to you, I would suggest starting with 2 Benadryl at bedtime. See how that goes. When you get up with a hit at night and feel fine, not wobbly or such, you could take 10mg of Melatonin.
When in cycle, I take 2 Benadryl at bedtime and 10mg Melatonin. After the second hit at 10:30, I will take another Melatonin. Then after the 1am hit, I take another Melatonin. If in high cycle, I may take 20mg at 10:30. It can help avoid the 1am hit. The Melatonin seems to make them more mild hits.