Do not enter your ETPs as waypoints.
Yes, do generate new ETPs if you get a reroute.
Generally you would not have to build new ETP's if your reroute was only 1 degree off your original course, which is pretty typical for a reroute on say the NA. There are several ways to generate new ETP's for reroutes further than one degree but I suspect most reading this simply call up there flight plan provider and go from there. Ah, for the old days when the real navigator working in his little dark hooch in the rear of the cockpit would refigure these points. Note that I did not say recompute!