How do I stop swapping the gender of nouns mid-sentence?

I've been studying Gujarati grammar for months, but I constantly misgender objects, which makes my sentences sound grammatically broken to native speakers. I understand the rules for 'o/i/u' endings, but in the heat of speaking, I freeze. Is there a mnemonic or a specific way to practice gender agreement without constantly checking Chickytutor.com for corrections every time I want to build a sentence?