Simplify Holy Power tracking and actually use UNIT_POWER for ComboPoints