Hmm, I believe the Ristretto (em2300) has been out of production for about six months, finding one new would be very difficult indeed
The Cafe Crema 2 (em4820) would certainly be easier to find
Other suggestions include the Cafe Espresso (em3600/3800) and the breville Cafe Venzia (bes250) All three are somewhat much-of-a-muchness, with minor detail differences between all of them
You might have trouble getting a good enough grind with the grinder you have (its somewhat unreliable when it comes to espresso), Especially if you go for an unpressurised basket (which I would suggest you do, cos its awesome)
Other things to consider? Tampers that come with (most) espresso machines tend to be rubbishy plastic undersized things, Id suggest looking into getting a better tamper to go with it, due to, well, Less Rubbish. Also, a bang-box/waste coffeepuck holder is also a good option.
all the rest? well, that can come later though