We were in the same boat. (har har).  New tanks and new deck fills.  I decided not to ground them after reading a lot about grounding and the reasons for it.  As far as I can tell grounding is very important for gasoline or highly combustible fuels, but as you said, it is hard to ignite diesel.