With the need to replace the upper strut mount, I'll probably buy everything, including new springs, and preassemble the new struts so that the strut swap becomes a simple six-bolt R&R.
When I had it aligned (5600 miles ago), the shop replaced the upper of the two strut-to-knuckle bolts with an eccentric, so I'll definitely have to have it aligned after reassembly. What I don't get is how the leaking strut was missed. It's wet clear down to the spindle, so it seems likely that it was already at least weeping when they were in there. No one said a thing.