I think you are correct. I expect that Hillary will be positioning herself to not get burned if Iraq turns out favorable to Bush and/or we get UBL. I'm sure their machine can put the screws on Kerry to step down, regardless of the votes he has locked up.
The thing I worry about is a Kerry/McCain or Clinton/McCain ticket, as I fear McCain feels he has little political time left to "vindicate" himself.