Maybe both then? An out of combat heal cantrip, and an in-combat temp HP one?
We would still need to limit things about to keep short rests serving their intended function, but maybe this:
Quicken Healing
Necromantic Cantrip
Casting Time: 1 minute
Range: Touch
Components: V, S, M (a poultice...