McCain would be a big mistake. Could anyone imagine Bush being advised on intel by McCain every day in the oval office? No way.
Move Ridge to CIA, backfill at Homeland Security with Zell Miller, and have the GOP governor of Georgia appoint the winner of the GOP primary to the Senate vacancy so that he runs as an incumbent in November for the full six year term.