fps_dean, you are getting way too crazy to balance vacation time over proper repairs. Call the service manager and explain your concerns about the car not being repaired. Take it in on a work day, get a rental car and you are out in 15 minutes and off to work. Tell them you will not pick up the car until they test it and they are sure it's fixed. Taking a week off from work to take the car back and forth is crazy. When the car is done, pick it up and drop off your rental car. You can probably do that after working hours.
You are spending a lot of time boo-hoo'ing yourself for buying a car with a leaking sunroof. It's not a lemon because it's not a mechanical or safety issue, plus in Florida,at least the lemon law does not apply to used cars.
If you are too overwhelmed by this, by all means take it in and trade it for something else and pray it won't have anything wrong with it.