2005 545i vs 2005 A6 4.2

I have a 2000 540i, and am looking to upgrade.
It looks like a dead heat between the 05 545i and 05 A6 4.2.

BMW has put me in such a difficult position with their pricing, body
design, and iDrive.

The first time I saw a 2005 545i I was like 'YUCK!!!'. I mean I really
wanted to like it but I just could not as hard as I tried. It truly
looks terrible to me, my girlfriend had the exact same reaction.

Meanwhile, the A6 is a very pedestrian Audi design - better in that it
doesnt bother me.

The Audi is limited to 130 MPH and although thats unfortunate, I think
I've only exceeded that once in the 540i anyway, and just briefly. The
540i is slightly faster in acceleration thanks to the torque if not
the HP.

I know I'll like driving the BMW more, thats what got me the 540i.
I've driven Audis - they are 'smooth' - real smooth, but Im not
looking for smooth, I like 'fun'.

Anyways - opinions?