Grinder upgrade [$1000-$1500]

I wanted to buy a new machine but after a lot of soul searching I think I decided that upgrading my grinder might give me more bang for my buck.

I’m currently sitting on a eureka mignon notte for espresso and fellow ode 2 for aeropress. I care the most about quality of grind, not frills. Ideally an upgrade would give me best of both worlds so I don’t need to keep two grinders.

Is it worth upgrading at this price point? Or should I stick with my original plan which was to upgrade my bambino to a rancilio Silvia pro x?