Hand grinder for Aeropress and espresso?

I currently own an Aeropress and a DeLonghi Stilosa machine. For my Aeropress I use a Hario Mini Mill and for the machine I buy pre-ground. Is there a hand grinder that would be a suitable upgrade for both cases? Thanks