I like Sam as well, but I think him hooking up with Dakota was the ideal place to wrap us his story arc. (I would have liked that better than to see him come back and be a pointless character in TDAS).
I really think you should've included the couple of parts when he just nonchalantly says "tried to warn ya" to Scott. Those were some of his strongest moments IMO.