Good luck OP!
For all those saying to Lemon the car...I dont think its a simple as just demanding a new car and the dealer saying ok. There is a lot of documentation and likely legal work that goes into the process. The dealer is fixing the issue and the car is still under warranty so no harm to OP other than a slight inconvenience. Now if the OP gets the car back and the same issue happens a few more times he may be able to pursue the Lemon law...