Everything about the game mechanically is improved, just don't hold your breath for those couple of iffy uncomfortable scenes to be much better.
It's not often that I find myself wanting to replay a game that is likely to take me over 100 hours to complete. I love Japanese role-playing games, but they're huge time sinks, and playing even the greatest JRPGs for a second time is often a tough ask of my gaming time.