Repairing your equipment doesn’t cost money if you use the repair rune. If your Focus isn’t charged, just charge it on the training dummy and you’re good to go.
And in the endgame, the problem disappears with the number of builds you can create that have good Focus regeneration.
I don’t think complicating the death penalty will make the gameplay more enjoyable.