Its going to get said so I will be the first GET A GOOD GRINDER !!!!
Your coffee will be ordinary until you do this first step.
Minimum grinder for decent espresso is the Sunbeam 480 or better yet Rocky, Ascaso, Ibiteral etc.
Machine is third to the good beans first then the grinder in getting decent coffee.