Well, there are a few different questions proposed in the original OP, which space battle do I like more (invested in), which I'd say ROTJ, by a fraction, but it would've benefited from CGI and therefore, I think the one about too much CGI, I'd have to say no.
Ok, I'll concede that the very beginning of the ROTS, when they flew by each other, that was slightly confusing and hard to follow with my eyes, but there are bits in the ROTJ clip, eg, the ship crashing into the death star, that looked pretty stupid (especially the people inside reacting).
Which clip I prefered overall, ROTS.