I started out with a Gaggia as well, actually I started with a Braun "espresso" machine, but I don't really count that.
After the Gaggia died several years ago, I bought a Quickmill Andreja and it has been working like a tank. It will probably outlive me.
I also use a Macap M4 grinder and roast my beans with a Behmor 1600 roaster. I get my green beans from the Green Coffee Buying Club.

A lot of people that see my setup instantly think I'm a coffee snob, but I really just like the whole process. I like office coffee just fine as long as it doesn't sit on the burner, but I really like tweaking my own cup at home.