As your car is still under warranty, I'd be booking it in to the dealer and let him sort it out. Could save a lot of delving around!