Actually nevermind, i found the “what happens when the trainer dies with stuff in the PC” text and it basically is my headcanon, albeit much less complex
Yeah, it really is the most sensible option all things considered.
Also, the way they ended up doing the returning villain team leaders makes sense and basically dispells all of my concerns about the whole issue.