I hadn't seen the Two Towers clip. That was pretty funny, though I suppose they felt having Legolas be better than Gimli at pretty much everything was getting a bit extreme.
Yeah, the deleted scene is on the 35th Anniversary two-disc DVD (which I a proud to have). Believe it or not, Steven Lisberger had stated that he wishes he hadn't deleted the scene.