I have been using the following mix over the last few days and it is very stable.
The trick was to go back few versions of gapps ...
In case it can help, these are the steps to fix the battery drain and the temporary fix for the non working WiFI:
For the battery drain issue (in my case I identified the NFC service as the culprit via BetterBatteryStaps). To disable the NFC serv...