I rebuilt the engines, using what I had learned from the prototype I had built before.
Each engine has a basic frame made from the front and rear caps and some spars. Two spars per engine have wing spar guide cutouts:
I then cut out the body of the engine. This time, I cut it into parts, so that I could trim the sections to fit properly as I attached each section:
Final assembly: