There is a certain flexibility here that is a matter of musical judgment.
Henle editors are one thing, but they can be a bit pompous/dictatorial at times. And consider the stature vs the likes of the pianists you mention.
I suggest you try it in various ways and go with what you think works best.
FWIW, I prefer the first grace note to lead into the beat rather than fall on it (a la Richter/Uchida). Though I prefer the Henle solution in the second bar.