As it's not been mentioned so far, check to see if the background illumination isn't still lit on the light switch bezel after the car is locked.
This prevents the BCU entering sleep mode, and instead of a quiescent current of 35 to 40 mA, you end up with a constant current of 2.5 to 2.8 A (2500mA)
Brian
