Jane, it also sounds like you might be a bit dehydrated most of the time. If you're not peeing light-colored fluid 3-4 times daily then you need better/more hydration.
The more chronic discomfort probably is your cuffitis. Best to get that under control, after this storm has passed. Is it being treated properly, do you think?