Stan, a few suggestions....
Yes, drink enough to keep hydrated--and depending on where you are, that's tough, it's been hot. And that means water, electrolyte fluids, etc. Caffeine is a diuretic, and will make you pee more.
Cut out anything caffeinated 3-4 hours before bedtime. That will give enough time to get rid of most of it. Cut out alcohol too before bed, same problem.
And, as other have said, if you're not out walking, start. 20-30 minutes at a decent pace is good for you. It will strengthen up the pelvic muscles--which helps your urinary muscles. It also helps with the cramping and gas. Doing a little aerobic exercise also helps your mood.
Give it a try--can't hurt, might help.
Age at Diagnosis: 56
RALP on 2/17/15, BJC St. Louis, Dr. Figenshau
58.5g, G3+4, 20%, 4 quadrants involved
PSA 3/10/15: 0.10
My Story: www.healingwell.com/community/default.aspx?f=35&m=3300024