Excellent progress there Alex, regarding the top, the OEM slides for the top, why not just remove the diffuser and the sides would just slide in and if at a later point you want the diffuser in again you could do so?
I know you're a all or nothing but others that might not want that approach could go back and fit the flapper again.