I investigated the temperature thing a little bit further and I made these changes:

On vanilla kernels the temperature raw value is still being used. On power kernels I use /sys/class/power_supply/bq27200-0/temp as a temerature source, which should be more accurate. Unfortunately this is not possible on vanilla kernels.