Build looks great!
Instead of making flaps could you make a piece out of the same board used for the formers and glue it to the former? Seems like that would be the way to go to keep everything fitting right.
Keep up the good work and remember that there is always someone worse at building...