Upgrade to a burr grinder would be the first step - this one from Krupps[0] I've had for about 4 1/2 years, got as a present but can be had for under £40. The increase in consistency is worth it.
One flag, bought one for my dad about 18 months ago, and whilst still functional and holding its own, feels a little less well made.