My 240D mount is fine too, but I did not replace it when I did the swap so I would like to now.
Here you can see the early manual mount with the round hole, and the later one with the oval hole. The auto mount seems to be the same as the oval hole manual mount, so that is what I will try I guess. Where did you find a heavy duty mount Winmutt?