Villafaña, Melano Return As Timbers Ready for Stretch Run