To be honest if they are having trouble remembering the line of succession all they need to do is open a high school text book.
Also, I think that if you put all those depts. under Domestic Affairs it will become a major clusterfuck. Remember how well FEMA worked under Homeland Security? It would get worse under that system. Not a bad idea, but I don't think that it is feasible.