I definetly think the latter, and I'd ditch my body for a newer one in 30 years if I could. Would be pretty great if a transporter also did "tune up" of all of the frail biological bits as part of the copying process (without messing with the brain hopefully)
Of course, I think that this is extremely impractical so it isn't a decision that I actually have to face. In this hypothetical scenario though, I'd much rather use the "transporter" as a cloning machine... having two of me would be pretty awesome.