Given that thunder strike seems to be a spell and not a cantrip, I don’t think it’ll replace shocking grasp.

Edit: As for the Wizard, they also explicitly stated that your GM may add spells to that list they deem thematically appropriate, so there’s a lot of wiggleroom.

With the new focus point rules, I wonder if there’s gonna be any changes to psychic, given that its ability to use two focus points per fight isn’t that special any more.