I'd still put Dunn and Kelenic while getting rid of Cano's contract up there.
Ultimately, whoever is better out of Trammel and Kelenic, thats the better trade. I'd put money on Kelenic though, and Dunn is looking like a legit #4 or #5 starter rather than a reliever that many thought he would end up as.