Thanks for sharing. Same issue on my 2015 and I also got to the same point and can't remove the switch as its moulded into the boot lid in this model. Did you manage to get it fixed?
Problem in a electric component where connected search their.the control board, which is located on the right behind the trunk trim. Usually the contacts oxidize there