To do what you're asking, for the Peak/Water Units option you need to pick 1-Tile Move, don't ever pick Pure Random if you don't want units trapped in mountains. Limit Classes will just force them to be classes that are capable of traversing the terrain they start on, I.e. Fliers, brigands, pirates, etc.