Never ending 07 S6

Hey guys. So my 07 S6 is still leaking oil. Was thinking maybe oil pressure switch. So I go looking around the webz and I’m thoroughly irritated. There was a switch halfway thru the year? So if my S6 falls in the early half, is there no oil pressure switch? Or is there one and they don’t make it anymore and I’m just screwed? Because all I see is the switches for the last half of the 07’s. Where in the heck is the early 07 switches at? I’m guessing the later 07 and up switches won’t be able to work in my car? I hate this. Already had to deal with that stupid drivers valve cover and gasket issue. Now this. I shoulda bought an 08 or something…