My vote is to stay GS. Remember SM, and all the shit you had to do to your car??? I’m looking to move back to stock now too. I don’t know anyone with a new Si yet, so I don’t know what they drive like. But if they move and handle like an ITR, GS should be a good time.
As for your old hatch…it’s seen better days. But it is still a blast to drive. Honda + supercharger = fun.