I would think option number 2 would be a little more money/time consuming, I may be wrong, but I think that would be the way to go. Since all these componets work together so well with the current set up of the C6Z06 and LS7 combo. Just my opinion.
GOOD LUCK!!
