Thank you for your Instagram post. I had not clicked into that link. I will go ahead and purchase the OE Nissan part and give that a try. I am so not looking forward to trying to pull out the aftermarket switch. Hopefully the fact that I used some high-temp thread sealant on it will allow for an easier removal this time.