By that logic it's

Envoy
Pro: Commuting, full bonus
Con: Reserve Length, contract violations, lifer top heavy

PSA
Pro: Reserve length, SAP, senior line holder at around a year
Con: Commuting, smaller bonus, Most likely will have to move

So it's leaning towards PSA just for the QOL of reserve and line holding.