Maybe using smaller LEDs would help, possibly 3mm?
Gee, you already have it redesigned, drawn up and ready to go with PCB designed. While I have only loaded Diptrace and found the parts section...and that was using Adrian's schematic (no redesign) and it's not yet entered into Diptrace. But, at least it's a start!
Yogi Berra out driving with a friend with a specific destination in mind... The friend said I think we are lost, Yogi replied, yea, but we're making good time! (That would be me and Diptrace)