I think we're much closer to getting this right in WildFly. Please see the WildFly instructions here: Design of WildFly Multi-JSF feature.
You no longer have to worry about changing module.xml files. Everything should work seamlessly with CDI/Weld no matter which JSF version you choose.
Stan