re: 2 astronauts
I always thought the smart way to do Mars missions was identical, multiple ships, each capable of completing the mission with the crews of the other ships on board. Some duplication, of course, but it would not require the incredible fail-safe design a single ship would. Maybe three ships with two astronauts each? I think three astronauts would work well too.