I always liked the E28 (1980s 5 Series) better than the E24. Something always struck me as "wrong" about the 6 Series, maybe just because it wasn't the old CS/CSi. I think I'd be happier with the M5 version of the E28.
(Of course, the E26 would be nice too.