If I were you I'd ask the Dealership to identify where the short is and fix it, not just replace the blown parts. And do it before warranty wears out. Also tell Nissan that you'll invoke "the lemon law" legislation applicable in your state. That'll light a fire under their ass and they'll most likely want to fix it.

Good Luck,