Don't forget the fuel tank mounts. Of all the things that were done to the 2013 M3W I owned, that job was the single most expensive item. I also don't think that the fuel tank mounts' design has been updated to avoid the cracking/leaking issue.
My fuel tank mounting system looks like yours and mine is new.
