Mine's doing a bit similar, although at a bit lower RPM, about 4k. The spark is very weak, so I'm planning on changing the coil. My fuel economy is also very poor.
Leads, cap and arm are new, so the only thing left is the coil!

__________________
Ben

'85 500 SEL
'85 928S2
'88 560 SEC
'90 750i