As Motability would say , the “contract” for any options is between you and the dealer/manufacturer, as such any complaints is between you and the dealer/manufacturer.
Meaning you are cover not only by consumer rights act 2015 but, also the motor Ombudsman.
Keep up the good work and don’t let them fob you off!