I think your first and second choices are both good. I just have the order reversed. I'd even be willing to vote for Rudy if he was second spot on the ticket. Then, if he helps the ticket get elected and doesn't give the middle finger to conservatives as VP, I'd be willing to trust him as #1.
I would think that Giuliani would make a good Secretary of State, or a good Ambassador to the UN.
Wouldn't THAT give Democrats conniption fits to see Rudy at the UN.