Agree on both counts. the current 3 series is very close in size and room to the E39.340i with a manual trans and the M sport package seems to be the modern version of the 540i.
But prepare for sticker shock!
For a non-BMW alternative, I read that the Chevy SS is the closest thing. But it's a Chevy... :thumbdwn: