How much are you prepared to spend? I cant work it out from the post.
Do you already own a decent grinder? Many people (me included) will suggest spending as much as you can on a good grinder, and, if necessary using a low tech extraction method (moka pot / aeropress) if you are primarily concerned with flavour.
If you have a decent grinder, maybe a second hand Silvia would do the trick for you at <$500. With fresh beans, a decent grinder and the right technique the Silvia will definitely outdo your old machine.