Correct interior light part number.

[lsupcar]

My passenger side interior light housing broke at the interior portion of the switch. In searching for a new part, the original part number seems to have been superceded by two other numbers that cross reference with the luggage compartment light. My luggage compartment light does not have a manual switch and the online pics of the new numbers parts also do not have the switch.
I am hoping to order a new light that also has the switch.
If I order the original part number and get the new part number, will it have a switch like the original?
Thanks.

[lsupcar]

Parts supplier says the new part number does not contain the switch.
So, I am changing this to a WTB post for an original style cabin light assembly.
Thanks.