Whenever I tweak my cabling I always do both. I recently tweaked everythink in my bedroom system to Nordost. I don't think it would have sounded right without matched cabling through out.
As for which to do first go for the best deal ;^)
As for which to do first go for the best deal ;^)