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. I prefer the idea that Empire overlooked it because it was too big to fail. TFA still has the stupid map and the stupider R2D2 activation moment, but it averages out so that both become simply mediocre. I would need to see it again to be sure how badly the lack of development Saw and uh (actually looking it up) Jyn get impacts it on the whole.