You can improve the taste of your urine with a "pristine" diet.
This means to stick to raw fruits and vegetables, and some nuts, and plenty of clean fresh water.
My urine is fairly tasteless to me, and I don't get the "amonia breath" anymore since going on a raw food diet.
One-half day of water fasting will clear up your urine enough so that it's the taste is no longer objectionable. If you drink only your urine and water all through the day and introduce no other foods or drinks, then your urine will clear up.
Once your urine clears up, (neither too acidic nor too salty), then try adding raw agave nectar. You'll be amazed at how delicious it is.
If it smells bad or tastes bad, then don't drink it.
Save the first urine of the day if it's too powerful for you to drink. Instead, save it and age it for about a week minimum, and massage it directly into your skin. Continue to save your urine for this purpose, and don't use up all of it, so that in a year from now, you'll have 1-year old urine to massage with.