Well, I bit the bullet and just had a tesla ranger replace ours. The model Y were not available for online purchase, so they had to come to our house (I didn't have time to get to the shop before our trip). I had bought some Bosch from Amazon but they didn't fit and I realized that I was wasting too much time trying to find something aftermarket that had to be modified. Price for the OEM was nuts but I don't have to deal with the hassle of sending something back that doesn't work.