I have been having thought that the office of President should be split. With separate head of state and head of government that runs the executive branch. Another option would be to have triumvirate with command in chief that commands the military. Maybe the President has power to dismiss the others, or there is system than one person can't take over, like the CnC can never be executive.
You could do that with current structure by giving all the executive power to the Vice President, and then President would be left with head of state role. They would run as slate, with the visible, charismatic President, and the unknown, competent VP. If the President dies, the VP loses all his power.