Make the heal spell, by default, a self-healing skill. (is this possible, with keeping the same range: 8?)
Incorporate a new button, something like a 'friendly' targeting option.

Here you could select the individual with 'blue' cross-hairs, and the heal would be directed at that particular person and yourself. I'm not sure how hard it would be though to make healing a self-targeting skill, while also having a 'range' to select and heal players from a distance.