Yeah, the 2 Firesprays makes it tough. I have the two different KR sets (ships+tokens+cards and YT/FS+ships) and I rearranged it so the 2xships trays are in one box and the YT/FS is in the other box with the tokens and cards. I'm going to add a third small box, which will let me carry everything, but the total cost for that is like $125. I think you can get the X-Wing Battlefoam kit for the Pack 216 for only about $80. Or there's a whole thread on the FFG forum of different ideas based on containers from Target, Home Depot, etc.