I'll assume if Thomas came back this way that he would play guard? Wouldn't mind that at all, hopefully Thuney can transition to RG in that instance.
As for the 12th pick, I do think any final trade involves that or the equivalent. Garoppolo displayed too many qualities in his starts to dump him for lesser value: lightning release, quick decision maker, good arm strength, hot........you know, all those things the Pats are used to having from the QB position for the past two decades. If the return isn't worth it, then I'd rather have him for another season as insurance.