GDay & welcome to Coffeesnobs!
Although Im still learning, one thing I have picked up from this mob is that a decent grinder is essential for reasonable espresso. *This is a lesson I unfortunately learnt a little too late!
Someone more knowledgable than I will point you in the right direction, but if your award points allow, try to get a machine that has a boiler rather than a thermoblock. *Ive had no trouble with the Breville Ikon which has a single boiler!
Good luck with your purchase! 8-)