DCJ Welcome to the forum. There are so many interesting machines/grinders on the market nowadays, it can be confusing and hard to choose. The only way to get the "right machine, is to think about your unique use situation and needs. Also be very honest about how interested you are in the “process” and "experimentation of making coffee. Super complex or nice and simple, especially with regard to maintenance (cleaning, servicing etc,,).
That path should lead you to the right machine.
P.S. Usually the more complex a machine, the more sensitive it is to bad water, so don’t forget that aspect.