Gaggia hands down!
I started with the infamous "Silvia'" and added a PID, then Vibiemme Super, then Alex Duetto twin boiler and twin PID and as mentioned by the Gents already
if you are an upgrade personality think of the long game. But of course if not then you have great feedback here already on your purchase. Don't get caught up in 15 bar vs 17 bar its marketing lingo, coffee's sweet spot is usually between the high 8's to low 9's.
Enjoy the journey !
Did you ever decide on an Espresso machine? Im in the market myself and leaning towards a Rancilio Silvia.