Just checking that you've seen the edge distance amendment added to the SB? (Page 21).
I had an old version of the SB and ended up replacing my doublers without needing to. The amendment states a lower ED margin (lower than mil spec) and adding extra rivet locations in the event that the ED's aren't met. Might save you some re-work..
Paid up - Dec 2018