The next item to tackle is the upper mount. With the rod end being shorter to the shoulder, it does not penetrate through the stacked bushing and retainer plate package. Simply drilling out the sleeve in the lower plate will cause problems, as when installed, it creates a solid bridge between itself and the upper plate and allows the strut nut to be properly torqued.
A sleeve nut, such as shown, might work, but the snout of the lower plate would need to be cut short so the barrel of the nut jams against it.
Could use a 25mm coupler nut and a hex bolt as shown, but the poly sleeve (loose insert in the rubber bushing) would need to be left out and the spacer snout cut short. Now the coupler would act as the spacer. I worry about the degrees of freedom in a multi piece solution.
Just getting this out there for debate and discussion. As a community I know we can find a solution.