Symptoms of Urinary Tract Infection?

This passed Sunday I urinated before going to bed. When I laid down it felt like the tip of my penis was getting itchy and it was odd, but I didn't think anything of it till I got to work the next day. It was constantly "itching", it was hurting, it's just the "helmet" of my penis. Over the past few days I have noticed it has been getting better. When I go to urinate sometimes there is like a delay from when I "tell my penis" to pee, and the reaction. It's very weird, but the itching has been slowly going away as I have been drinking a lot of water more. Are these the signs of UTI? It's not an STD