I'm 99% confident I have all the bits. Also confident the Starboard Bay will go back together well.
Getting there bit by bit. The Engine Box & Waist, which I only just finished modifying for Brad, should be done by tonight. Can spend tomorrow on the Bay.