Right now the two top contenders for me are a Marin Larkspur and a Marin Fairfax. The Larkspur (which is a 'street bike' has a rigid fork but if I move up the ladder to a higher model I get the lockout you're talking about.