Yeah, on a closer reading one mode of WPS sounds like it would fit the bill. Too bad that it has also the major security hole mode ("enter AP PIN on device" mode). Hopefully that can be selectively disabled and eventually deprecated.

edit: Whats in WPS 2.0? There are some references to it, mainly saying that it could fix the security issues in WPS. But I couldn't find any solid info how it would to that.