I agree - the stock headunit is terrible! Aftermarket is the only way to go (probably for both the amp and headunit unless you got the stock amp free or real cheap)

and now for some self promotion:
Check out my thread in the Private Classifieds:Blaupunkt MP48 London / Panavise mount
Blaupunkt MP48 - matches perfectly and installs in about 5 minutes