Well, after much thought, I think I will orde the B17 Select and the Team Pro.
Today I've re-tensioned my B17 and applyed loctite to the bolt. Went on a 40km road ride and it stayed with that tension, a lot better. But it would still be a lot better with thicker and firmer leather