Need some new Tri apparel!

So, I had one pair of Tri shorts, which I used two years ago for a sprint triathlon race.  Fast forward to 2010, I've worn my shorts outside, ran in them, and even trained in the pool with them and well, they aren't quite the fit they used to be.  I had a pair of 2XU Comp Tri shorts.  Great pair of shorts, for the 1.5 years I had them, but they don't fit well anymore.  They are all stretched out, and there seems to be some parts of the shorts that look like they are thinning out.  Perhaps my shorts are falling apart because of the pool, that is lesson learned #1: don't wear tri shorts in the pool on a regular basis, they will disintegrate.

Well, I have a sprint tune-up try coming up in 2 weeks, and I need a pair of tri shorts.  I've been looking at Sugoi Velocity Tri shorts, 2XU Endurance Aero Tri shorts, Orca, TYR and Zoot.  I plan to reserve these shorts for race days.  What I'm finding among most of the tri shorts is that the higher priced shorts use different technology, for example the Sugoi Velocity Tri shorts use a very thin,  stretchy, woven material, very different than their other products.  I'm kind of split, I don't know whether to try out a new vendor, or stick with 2XU.

I am also looking for a tri top.  During my first sprint tri, I had planned to put on a compression under armour t-shirt on, after swimming.  BAD IDEA, which brings me to lesson learned #2: don't try to put a compression top on when wet, you'll end up looking like a fool, which is exactly what happened to me.  I tried to put my top on, ended up ripping my bib, and looking like a fool trying to get the tiny shirt on.  Don't know what the criteria should be here other than I know I want a top I could swim in, but if I chose not to swim in it, a top that I could put on easily.  I don't want a full zip.

If anyone has any thoughts on this, or knows of any other vendor's that make some good tri shorts, let me know.  My criteria: comfortable, padding should be comfortable and the stitching not itch or scratch.  Shorts would preferably have pockets for some nutrition, and the inseam should be longer than 7".

What I'm thinking - any other ideas?
2XU Endurance Aero Tri
Sugoi Velocity Tri
Orca 226