To be honestly, i did SMC and NVRAM reset for about 3-4 times for both, but i still don't think this is the main reason of battery performance solution. I didn't had such great problems like 2-3 hours of battery life, only one time of hard using i had 3:30 hours but my brightness was set to 100% and almost the whole time Mac was using dGPU instead if integrated. In every other times i had 5 hrs - 5:30 hrs - 6 hrs - 6:30 hrs even with just browsing the web and all other apps closed. Im still 100% of sure that its a software problem. System is showing 12:30 estimated time at 100% but after an hour of just only browsing the web its ~ 8 hours, but in the real world its like 6-7-8 hours from 100% to 0%.
At the brightness set to 75%, keyboard backlit at 1 click, BT is off, background apps are off, i can get 8 hours of browsing the web via safari (4-6 tabs) and do some easy stuff like Pages, Spark, iMessage, iTunes and etc.
Im not going to return my purchase, i do really love this machine, i had enough of my battery life (ofc its annoying thing in a device for ~3000$) - but i'm waiting for the update and only then i'll think about get this thing to Apple for inspection.