Whitebeard is a nice, straight upgrade. However, some of the SHs, like Zoro, change their useage around. For them, there may be occasions where it's better to have the normal version. In the long run, it will likely be best to just get a second copy of said character. However, that also means re-socketing and re-S.LVing.
This is what I was going to go with. But then, I've kept a copy of every version that of the SHs in my box, so between that and horrid sugo luck, this is a pretty easy option.
Ex: I have a max skill gear 2, but I also pulled three gear 2s this past sugo.