The way I've been doing it when the main dies, is not releasing spirit on the main.

Just continue to select different mobs on my dead main

My regular macro on my alts
/target main
/assist

Still works for me.

I only use focus for targeting for sheeping.