I think the documented method is the only fix likely to be available for a while. You could script the data collection or use a 3rd party tool. I think TagVault might offer one. Also, SCCM is be adding support for inventorying SWID tags in the future.
TagVault.Org
hth,
Ben