I think if this was late September, and you could get the Drouin extra, I do it.
It being late June (or even call it early July if you wish), you don't have a rush to make this deal. Tank should net you a big package, the rest of your forwards aside. Klingberg is a great piece to target, but I value him less than Tank. What I'm trying to say is tank your time, leave no stone unturned, and ensure that when you make a deal, make it one you are happy with.
I do also agree that you are best off getting a D keeper to fill out the last roster spot for one of your forwards, than having to reach in the draft or wait on a youngster.