Do the new ATL CComModule replacements implement RegOverridePredefKey correctly?

Question

I have a project that stated in an old version of Visual C++, so it uses CComModule.

The only problem is that I set up RegOverridePredefKey to install in HKCU if HKCR fails. This works fine in XP, but on Vista, the implementation is broken! I found some posts on the internet corroborating that it is indeed broken.

I was wondering:

1) If anyone knows for sure if the new replacements for CComModule, for example CAtlBaseModule are worth implementing in this (if they'll fix the problem of installing in HKCU if the user doesn't have administrator privileges).

2) What it takes to port from CComModule to CAtlBaseModule. What do I use instead of DECLARE_REGISTRY_RESOURCEID, etc?

3) What are the alternatives to using this ATL self-registration. I want to do the self registration, but don't want to do it manually. This might be the only option, though.