Here is the nearly finished item. The arms are all bent properly, the wing is fixed down and the arms are bolted to the original lower frame.
I say it's "nearly" finished as the mounting bolts are too long and they have been  secured with nylocs. I will swap them out for the proper fasteners when they arrive.
Time will tell if this solution works any better than the last one.