No, life expectancy is calculated based on the average age at death in that year.

Actually, I think you would prefer the black hole since it's smaller and therefore less likely to actually hit us (although even if it didn't hit us it could still rip the earth apart with total forces at a certain distance, although I'm pretty sure the distance is still smaller than the radius of the equivalent star)