Should he even be mad? Dude got promoted to be a GM without basically any qualifications (it seems). Guy is set for the next decade+ (or whenever JR dies).
Yeah, give him a 2 year deal. And announce it towards end of off-season/spring training so you can give yourself 40-man flexibility all off-season/place him on 60-day IL at Spring Training.