John
Yes I also bought a solid carbon spar as the one I had with the plane was too short.
I recall the mains were also BVM units, they really needed a larger cylinder which was alongside the leg. I cannot see BVM listing the old style mains on their web site.
John