While breaking off diplomatic relations is an extreme step I wouldn’t recommend, I do wonder if it might not be practical to severely limit the number of diplomatic immunity eligible people allowed in after something like this.
Tell China that henceforth they get to send no more than three or maybe five people to whom it applies. Still gives it to the ambassador and a very small staff, but removes the feasibility of sending in teams of spies and kidnappers thus protected.