Would rather have full MP and TP gained upon wipe as well as the CD reset than this.

I understand what OP is asking for, but you're... asking the removal of RNG [outside of combat] for leaderboard purposes that... SE doesn't even support.