The next best thing to upgrade first is your grinder. Here's two options I recommend frequently. Otherwise, there's a bunch of options to research on what works for you. Stay away from blade grinders.
My #1 choice for brewing
Affiliate Disclaimer: these are all affiliate links that kick back a small commission to us if you purchase through this link.