Good to see it sorted!
But about 'My going through my dealer was possibly a mistake and will not do that again': nrmally the retailer should be a customers POC, not the manufacturer. So you acted OK, but your dealer absolutely didn't.