Oh i agree! The random table is mostly there to help spring ideas in a pitch, but shouldn't be taken as gospel ! I really like the overlay idea, and that exactly how you should use pick from the buffet of choices and only use the ones that makes sense in the fiction!
In cool news, I'm planning on adding a quite a few supplements (including enemies). Once i get enough of it built out, a friend of mine who publishes games is going to do a print run!