Hi Kanda, good luck with the upgrade.
The Mazzer Mini, Macap M4 or Compak K3 would be good choices IMO.*
Second hand is not a bad option, grinders of this quality are very robust and should last for years & years in a domestic setting.* On the other hand, you can pick up a Mazzer Mini from a sponsor for around $750 which is a very good price.
All comes down to budget really.* You will get better results with a large conical grinder but youre in $2K territory.
I have my Jr paired with an ECA Best. Aesthetically its a very nice match but there are probably better options at that price point from a pure performance aspect. It would be great if it had micrometric adjustment.