Got the two O-rings.  Looks like the smaller nitrile one fits.  I tried to squeeze the thicker Viton seal in as I know that's a much better O-ring material but it just didn't want to go in and I didn't want to break something.
With the pickup out of the way it was definitely easier to tighten the plug bolt on the oil level sensor.  Still annoying as I still had to do it with a closed end wrench (fun fact: a 5/16" works on an E10 head).  But I got the sensor back on.
Then I did the pickup.  Also easy.  Wish the black O-ring fit a little tighter but oh well.  The old one was square and starting to get fairly hard (not totally brittle yet).  Kind of seems like a service item you should do every 10 years.  I know it's a big deal on my E55 and NOT easy to get to on that car.
20211231_133241.jpg
20211231_142638.jpg
20211231_142644.jpg
20211231_142656.jpg
20211231_142859.jpg
20211231_142908.jpg
Oh, I found these metal shards in the oil pump pickup screen:
20211231_142935.jpg
My best guess is this is remnants from that mystery cam replacement that happened when the car was brand new.  I am not sure if this is bearing material (kind of looks like it) but there does not seem to be anything wrong with the engine so I am just going to do the right thing and pretend I didn't see it.
Also it took a long time to clean off the pan and cover surfaces to prep them for new RTV.  Maybe the most annoying part of the job.  But I got it done, goobered some stuff on the pan cover, smeared it with a clean glove finger and slapped it on.  Torqued to 10 lb-ft in some kind of pattern.
20211231_173240.jpg
I let it cure for an hour (went on my walk) and during that time it occured to me that I did not put the drain plug back.  That was correct, I had not.  Geez.  So I put on a new copper washer and put the drain plug back.  25 lb-ft is what I did.  Then I attempted to dump 9 quarts of oil in.
I say attempted because this is where I made my patented stupid mistake.  I added a full 5 quart jug of M1 0W-40.  Then I picked up the other jug and added 4 quarts.  Only problem was this:
20211231_171850.jpg
Yup I grabbed the 5W-30.  So now I have to do another oil change but honestly it's not a bad thing because I was working inside the oil pan and despite my attempts to be neat and tidy I am sure I got some crap in there that was on my gloves or something.  So I'll do another oil change soon and chalk it up as a flush.
But the good news is everything seems good.  No leaks.  Once I do the second oil change I'll worry about checking the oil level on the dipstick, hopefully see a perfect oil level, and then I guess hope I don't see the "check oil" message until the oil is actually a quart low or whatever.