To be honest both have the same amount of distracting fan service and poor writing. At this stage R1 bothers me more because retconning the exhaust port from a flaw to a feature is so lazy.
The R1 novelization shows that the exhaust port was rushed to approval, as a quick fix for the reactor overheating, because the project was behind schedule.