Yes. I think at the very end he tries to show Borden how committed he was by saying something like “You don’t know what it was like, convincing myself every night that I would be the Prestige and not the man in the box.”
He knew that “he” would have the subjective experience of falling through a trapdoor into a tank of water, and drowing without hope of escape.* When we see Borden below stage trying to break the tank open, Angier is struggling hard and begging to be saved.
*Simultaneously, “he” is also having the subjective experience of stepping into the electricity and suddenly finding himself at the back of the theatre.