I think you’ve bumped into the way to make the end of Season 3 really hurt, and really throw the show into a fresh balance for season 4: “Our” Morty will get killed. Permanently, irreversibly.

Only if that bunker was furnished exactly like Jerry’s hotel...

It makes sense. Jerry could have easily been recruited as part of the Gobo return plan - and screwed it up - while living in his hotel. But if he asked to have the memory removed, the person to do it would be Rick, and Rick would not leave the helmet and tape with Jerry. Also, not every mind blower took place…