Steve,
A quick and easy fix is to use longer M5x0.8mm bolts and stacked spacers made from presta valve washers.
I did this on my Sherpa. As I recall, only two washers were required on each longer bolt for the bottle cage to clear the derailleur clamp.
Best,
Dan.