Ball overhanging hole

[MikeH]

Probably my strongest pet hate. Consider Dec 16-2/0.5 and compare to Dec20-3d/1.
So my opponent and I tee off on a par3. My ball is overhanging the hole and his is 3' away. We both mark and lift/clean. He replaces his ball which after being at rest rolls into the hole - he scores an ace? I replace my ball on the lip which after 5 seconds falls into the hole and I score a 2.
I'm sure this is probably in place to prevent a player whose ball overhangs the hole from lifting, cleaning and replacing in such a manner that it most likely will fall into the hole.
My suggestion would be to change the other situation and re-write the last paragraph of 20-3d.

If a ball when placed comes to rest on the spot on which it is placed, and it subsequently moves, there is no penalty and the ball must be played as it lies, unless the ball has rolled into the hole in which case the ball must be replaced or the provisions of any other Rule apply.

I considered applying the same 1 stroke penalty as with 16-2 and then thought na! he could still 2 putt and I win the hole.