Thanks.
I when checking both, I came across the idea that I should update to Stretch or Testing (finally), then update everything, and then look at your suggestions.

I don't know why I wasn't paying attention to the Stretch release.