If you wish to make a remake of "Forrest Gump", you make a remake of "Forest Gump"!
For me, the movie ended when in the very first scene, Amir Khan opened the supposed to be a box of sweets and it was filled with "dry" gol gappas while he poured that "paani" from that bottle, my anxiety and OCD kicked in and that was it for me.
Don't torture your audience, please!