Wifi drains battery after Marshmallow Upgrade - See first post

It seems that it is an old “recurring” problem after some updates. I hope the next update solves it, and that it comes soon!!! Otherwise I have to do a factory reset.
The heat has even busted my SD card.
Android 6.0 and hot backside FP2