I have just ben catching up on all this discussion and have to put my 2 cents in re: Sam and Todd.
I agree with Milks that they should reunite. They are definitely best as friends at the moment - Todd needs to get to know her again as she has changed from when they were together before - but when they have become good friends again and Todd knows 'new Sam,' I think they are right for each other. After all, there must have been something he saw in her initially, ad he did put up with a lot from her so now that she is a nicer person it could work.