The clonk can be down to a worn prop shaft donut
i had this replaced and it helped a lot.
Also why dont you lot invest in the bmw tool easy to use and you can teach
the gearbox shift bite in every gear it also does a lot more all you need is a laptop and this cable its £37.99
http://bmwcables.moonfruit.com/