I really can't recommend battlefoam custom trays for Xwing.
I had a really good experience with them for WH40k and thought it would be ideal. I created 6 trays for my collection with the idea being that as the collection grew I would simply expand the number of trays. Out of the box there were issues with the xwing shapes. They were far too tight and and I was worried that I would damage they guns (which I later did, despite being very careful). I spoke with Battlefoam as soon as I found the issue and they were simply not interested. The short version is "the community didn't like the old xwing shape so we made a tighter one, we don't offer the old shape, there is nothing we can do, you can cut your foam but you void warranty, bye". Needless to say my review never made it onto their sales site...funny that.
Enter........(drumroll)........SirWilliblads! http://sirwillibald.com
Sir Willi produces pdfs for cardboard hangers in a variety of different configurations as well a other things. The PDFs are free. Your only costs are a ream of 200gsm paper, a glue stick, your printing and your time. I use the individual ship boxes (microhangers) and a friend of mine uses the ship+base+plastic boxes(gearboxes).
The protection is surprisingly good as the boxes are tight but square allowing you to pack them and they don't move around. They also take up waayyyy less space in what ever container you decided to put they in. I carry my collection is 5 plastic boxes I got from the reject shop. one each for Empire/Rebels/S&V, one box for Resistance/New Order and one box for Galactic Republic/CIS.
The only downside was that SirWilli stopped making PDFs a while ago but I used the link he gave to a maker site and I spent the time to make my own boxes with the same art work.
Enter.......(drumroll)......FastWalker. https://drive.google.com/drive/folders/1srCpFP_8qhPpWnbtQ35FiyCAxmWN5QMQ Sadly a little late for me as I had already done my own ships but FastWalkers designs are equally good and are a good match up with SirWillis.
I have seen both these guys on the Forums here and cannot thank them enough for the hard work they have put in.
In my opinion the cardboard is far, far superior storage for a more elegant gaming experience.