They did exactly what I asked.
They also replaced some bulbs for free as a courtesy.
They also found the worrisome issue that I was struggling to define. Turns out we are okay for a while; John gave me advice on what it is, how good my car is now, when to address it and what to budget for it going forward in 6 months to keep my 15 yo camry running solid.
Thank you John!