UTI or STD?

SO basically, starting 2 weeks ago Thursday, I started feeling stinging sensation while I pee. As this is scary for any male or female to go through because the first thought is STD, I did research on the internet. Have not gone to a doctor yet but I am planning to go tomorrow because I thought this problem would subside with time. Now it really only stings when I wake up in the morning or if I did not have enough intake of water; water, ive noticed, especially when taken in cups back to back, seems to dilute the acidic nature of the piss, making the burnin sensation stop. Now I read that it is good to intake the water for bacteria cannot grow or spread (if UTI) but if not treated soon can lead to kidney problems, which of course I do not want. Havent experienced any other symptoms. Something esle: IM uncircumcised and the meaty part is swollen just a little; the only visual thing that is on my penis is this. Also seems to especially get swell after I ejaculate but seems to decrease after a period of time. Last time I had sex before those 2 weeks was about a month before, but wore a condom and made sure that when I ejaculated that the condom wasnt broken, which is wasnt. So could it just be an infection, because I know being uncircumcised is different than circumcised so maybe it is just that. Def going to doctor tomorrow to double check but if anyone has any experience, or is certified in sexual health, please let me know your opinion.