It looks like the issue you have is the front rack. Looking at Surly's tech sheet for the rack, it looks like you could use a 5-7 mm spacer on the fork blade and on the dropout mounting points and get enough clearance to still fit your fender's safety quick release to the front dropout mount.
This is a Tubus Tagra front rack, but I don't know why it would not work on the Surly rack.
Rear rack and fender mounted at the same mounting point on the rear dropout.