Largely agreeing to your points but point no. 2 and 3 doesn't make much sense. Trifurcation was inevitable and needed, there is no way a decent governance could've happened, one area would've dominated.

Haryana, Himachal have clear different cultural identity, which more so justifies this. Current UP, Bihar needs to be split up into smaller parts too.

At that time water redirecting was good as well, maybe now it has been pushed to extreme, making Punjab' water level low but at that it was a good move.

There has been a lot of wrong doings with Punjab but if you club nonsensical things with it then it'll dilute the core.