The new rules are designed to make you all think of editing your entry in the context of editing a segment... (well, that, and it makes it MUCH easier to judge 100+ vids if they aren't all 7 mins long). The idea is to put your best content in there and paint as good a picture of yourself as you can. Use your best judgement to determine if something is a repeat trick- there's no cut and dry answer, but once you've shown that you can do a particular trick on a particular feature, there's no reason to show it again. Max out your 2.5 mins with the biggest diversity of skills that you can!