Well, it seems we've reached an agreement.
I updated the OP with the final settings.
I can't seem to get to the combined CBM/EDM/UWGIM mod Pyg posted the link to though. When I follow the link I get an error message and am then redirected to the Filefront home page. Is that just me, or does it happen to everyone?
I'll throw myself into nation assignment now, so everyone's nations should be up (relatively) shortly.