I was touring with a (double-leg) kickstand for 20 years, before my wife got a Tout Terrain. I (and she) loved the steering lock so much that I was immediately jealous, so I got the SteerStopper as an add-on for my bike. It's at least as good as TT's integrated solution. The SteerStopper takes a bit more force to engage/disengage, but it's a bit less-fiddly than the TT (though my wife has TT's v1; your v2 might be slightly better). I know you're only looking for an integrated solution, but I just wanted to say that as someone who has had experience with both, they're essentially equally excellent upgrades. Both come with the same nice side-effects too: keeping your headset bearings in-place if you remove your stem, and acting as minor bit of security for someone attempting to ride off on your bike.

The SteerStopper initially seemed stupidly-expensive for what it is, but the cost quickly felt "worth it" for the value it delivers. I've had it for four years, and we both engage our steering locks literally every time we get off our bikes.