The restructure was interesting and has a lot going for it, but you’re right that this thing is a Gordian knot. And there’d have to be something in his helmet vision to bring him to being FIRED UP when we see him next.
Better yet, just remove the helmet vision from the restructure and have it be the Rey only vision that someone here mocked up. Can’t remember who that was 😦