I installed some MaxLux (kinda an experiment) bulbs on amazon for like $44, they are indeed D2s.

They're maybe 25-30% brighter than the old bulbs (2006 OE as far as I can tell.)

You will probably get better results with the Phillips 3400 lumen updated versions, or even the regular 3200 lumen Phillips bulbs, but they're about $140 for a pair cheapest, and most retail parts sites will want $300+.

I tested one after I did it, the color shift on the old bulbs was dramatic - I didn't realize how purple they had turned. The new ones are slightly more yellowishgreen but I've been staring at blueish purple for so long it seems more pronounced.

The color shift is probably what made it so difficult to see on wet roads at night, now that it's white again I'm hoping that's much improved.