If you choose to go back to the dealer, I would recommend taking in your own oil. Delvac 1 is the best you can get. I have a hard time finding it, so I use Amsoil heavy duty marine and diesel oil in 15W40.

And if you take in your own oil, make sure they don't charge you for oil. I've had cars come back with my brand new, full, oil jugs still in the passenger's floor (what did they think it was for?), and I've been charged for oil when the used mine. Like I said above, they aren't that great. You have to watch them like a hawk.

__________________
Rick Miley
2014 Tesla Model S
2018 Tesla Model 3
2017 Nissan LEAF
Former MB: 99 E300, 86 190E 2.3, 87 300E, 80 240D, 82 204D Euro
Chain Elongation References