Brocolli, cauliflower, and brussel sprouts can cause an odor. Also, if you are on an extremely low carbohydrate diet, that can cause what is called ketosis and that causes the urine to have a strong odor, too.
Tyno - don't ignore your symptoms. Your doctor should refer you to a urology specialist. Your symptoms are specific, related to one another, and have occurred over an extended period of time. A "gravelly" bladder is vague and really not a diagnosis at all. Insist on a referral!
Also - bubbles in your pee, or "foaming" can also indicate protein.