That's awesome, did you ever get round to making one in the end?
I've never heard of using leaves. I guess I can see why they would work (natural cover) but I definitely recommend using egg trays, so much easier to sort through the trap at the end of the session. (quicker and also less chance of hurting the moths too)
RE: New Moth Trap! - Preparing for the first session