I just became the proud owner of a Diadema Junior :D I was facing a similar choice, upgrading from a Krups Novo :-[
Three days on and I am producing reasonable espresso and my average shot on the Diadema is on par with the best I ever pulled from the Krups!
Steaming milk? Ill keep you informed as Im still coming to grips with a 20sec window to attempt microfoam as opposed to the old 2 minute routine >:(
Just my 2 cents worth as a recent convert from a basic machine to something much more special ;)