Agreed. McCain over Giuliani, ALL DAY LONG!
If you're taking a tally, I'd go Giuliani over McCain...if for no other reason than that pesky little emotional instability thing that nags McCain.