I wouldn't worry too much about attributes not ideally suiting your particular build: the game is very flexible about that sort of thing and there aren't really any rigid rules separating warrior, mage and ranger. Some cross-pollination of skills is actually quite useful (though personal preferences are another matter!)
As for locations, they changed between Ego Draconis and DKS: they're more randomly spread around in the latter from what I understand.
