Just measured the corrugated tubing. It's not the BMW OEM part 12 51 7 803 874. The tubing used is more than 130mm in length that this BMW OEM wiring repair tube is. The one my dealer used is closer to 300mm+ in length.
I've got one more day before BMW Motorrad Australia are supposed to get back to me on this issue. Hopefully, they deliver.
Still wondering whether a BMW Service Bulletin went out regarding this issue and that a proper solution is available.