Temple Checkpoint System Rework Needed!

I have been out pacing my gear with my temple progression. I now die continuously and have to run 10-15 empty rooms to get back to temple clearing. To state the obvious, I am getting so frustrated that I have started turning of the game due to this problem. I would suggest a checkpoint every 2nd room with a permanent teleport friendly checkpoint every 4rth room. I've noticed the current checkpoints that pop up here and there get disabled the further you progress. I hope to see some changes made soon as temple is the only real endgame.