Just speculating, but Adames' old form is about a 110 OPS+ with about 30 HRs. Since the start of May, he has a .773 OPS with 11 HRs in 199 ABs. I'd argue that he has already returned to his old form. I also think that Oracle is suppressing his numbers. IMO, the backloading of his contract is an issue, and that SF has to pay for that, as well as pay for some of his age 34 & 35 seasons. But I have little doubt about his current performance.
IRT CJ, I don't think the Nats would trade him. They are finally contenders for the first time in a while.