bobcousins:
The first replicates the latest Due schematic, so would be the "safe" choice. Those little chips are quite fragile though, I destroyed one in my first attempt at rework.
I thought that it would be very hard to remove and resolder the tiny buffer, letalone that the GND is a plane and NOT a trace, it will be harder to cut loose.
I will order some 0603 resistors and will try the fix by cutting the output trace and soldering there. I will also modify R99 and maybe R23 if I get into problems with reset.