@mxyzptlk32 That post of mine goes back to 2017! I no longer have a Misfit (not the same as Fitbit), I have an Apple watch which does not track sleep.
I still have trouble sleeping, and the frequent bathroom calls don't help. I have been taking a half of a Benadryl most nights and I do find that's just enough to help me, and even when I wake up to go to the bathroom I get back to sleep faster than I do without it. I asked my doctor about it and she said that she felt getting enough sleep was more important than anything negative about Benedryl, especially that small a dose. It could help you, but check with your doctor. They may not feel it's right for you. I definitely do not have sleep apnea so a CPAP would be of no help.