Without iTunes on a computer to help you roll back to older firmwares, looks like the only solution for you is to pray that future updates solve the battery issue.
My 6S+ is still on 12.0, and getting 7-8hrs usage per charge. Still undecided whether I should update to 12.1, or wait for future versions.