Whilst I was in the mood, I fixed my B-Wing based substantially on this video by GameTime. I used 2mm magnets from ModiFX. I did it a bit hastily and it's not as neat or secure as it could be, and I'll do it with more care when I get more B-Wings.