Decided to play it safe and replace the pistons. I dropped one during the disassembly and dinged it pretty good. Thought I had a source lined up for a single matching Mahle +.040", but turns out his inventory was incorrect and he didn't have it on the shelf. So, I ended up just buying a new set of 4. Dropped them off at the machine shop to have new wrist pin bushings installed and reamed to the proper size for the new pins, and they were able to turn them around by lunch time.
Over the next week or two I'll drop them in the block with the crank to measure the piston height at TDC, so I can run some numbers and determine how much to have the block shaved.