You don't have pain? In the absence of pain, I'm not sure it would be either of these. Your main continuing issue is pus in urine after you masturbate? For deep yellow urine, this usually is a sign of dehydration. Try to increase your water or liquid intake.