Having worked with Sasan and Long I know for a fact that both are good guys and hardcore BMW enthusiast so it's sad to see threads like this.
I personally have had some KW Clubport pricing issues that lead to some embarrassing price quotes. The KW price list is horrible to say the least when it comes to the EDC vs. non EDC kits. A few years ago when we would order "KW Clubsport with EDC" the kit would come with the EDC delete units for the same price as the kit shows on the price list. Now you have to take the price of the Clubsports (even though the price list says -"M3 (E90/E92) equipped with EDC (Electronic Damper Control)" and add the EDC delete units to get the total price for the kit.
The "bundle" options does not have Clubsport listed-
M3 (E90/E92) equipped with EDC (Electronic Damper Control)
Sedan, Coupe (bundle: EDC disable unit 68510119 is included)
At the end of the day I hope that you guys can work this out and move on.