If it were me building the two mains you describe, I'd do this:

Rogue/Ranger - DEX to 8 and probably the rest in perception since I tend to use my rogues as scouts by themselves, and perception bonus helps you find the traps and secrets.
Skills: Walk in Shadows, Tactical Retreat and then choose whatever appeals to you. Fast Track has its uses.
Abilities: one in lucky charm, scoundrel and one in sneak. The rest as you see fit
Talents: Guerrilla and back stab
For your speed attribute, you can probably find gear to boost it. I'd focus on DEX and boost your perception to 12 or so as you level. you might want to dump some points into speed / CON as you level to boost your ability points in combat if you find yourself using the rogue more and more as a damage dealer. They really start to excel after level 10.

Mage - INT maxed
You've already outlined the abilities. For starting skills, I'd take oath of desecration, midnight oil and spark. You'll use the oil/spark combo a LOT early on to roast the early undead you encounter. You'll use oath to boost Madora in her tanking. I'd make the mage be the loremaster because it makes sense. I'd make the mage the leader and give them the pet pal and know it all talents. Pet pal early on helps with your immersion into the game and will open a couple quests to you. Know it all boosts your intelligence but lowers folks opinion of you. That's easily overcome once you're not hurting for cash and can overpay in trades. You'll probably leave the bartering to the rogue anyway.
Later in your build, acquire the blind spell at level 4 and use it liberally in every combat. A blind enemy can't do much to you. Spend your ability points on boosting the geo/pyro/witch abilites. You can find gear to boost leadership. For your attribute points, continue to boost intelligence. If you want to boost speed/con and get the most out of glass cannon, that's another viable option.

If you go with the two companions rather than hiring henchmen for the hall of heroes, then yes, Jahan makes a good crafter. You can find enough gear to boost crafting / blacksmithing skills for him.

Hope some of this is helpful.