If it is in your budget, I would suggest the Simonelli Musica espresso machine and Baratza Vario grinder. I just recently started using this setup at home and it is fantastic.
I still have 2 Nespresso machines for when I don't have the time to pull a proper cup of espresso.