Could it be related to the new kernel and not the aging of the battery? did u try lately without swap?
In my case it was the only thing I did to regain the life of the battery.