I'm going through the same thoughts. Baja Designs or Rigid... Baja Designs seems to be the superior product (waterproofing approach seems better, interchangable lenses, lifetime warranty, preferred color temp of 5000K over the more blue output of the Rigids) but Rigid seems like a great product too and far more popular. I figure after spending so much on the truck, it's worth doing it the best way possible though. Tough decision!
At this point, I'm thinking Baja Designs 20" OnX 6 combo in the lower bumper license plate area (no front plate needed here in TN) and then a pair of Squadrons in the fog light pockets with wide lenses on the outside pair and driving lenses on the inside pair. As a nice bonus, I'd plan to just leave on the outside pair of wides on as DRL's. I called Baja Designs yesterday and apparently they have a bracket in the works for mounting the 20" OnX 6 in the lower bumper area, but it's not available just yet.
The tough part is deciding between the 20' OnX 6 package described above or going with the existing double bracket and two 20" Stealths. The Stealths provide redundancy in case one goes bad and also offers more total lumens (16,800!) than the single 20" OnX 6, but also more $$$. With the two 20" Stealths and the Squadrons, the total tab is getting scary close to $2,500. That's a lot of scratch for lights in anyone's book!
Ahhhh... decisions, decisions.