Riot Gear with shield is not worth the investment, you'll be better skipping it and its feats and use metal armor, either heavy tungsten armor or super steel armor if you grab armor sloping feat.
I'd suggest dropping Will to 3 and getting 7 dex to get Escape Artist feat.
Also you shouldn't invest in all psi disciplines, especially with low will, focus on only one.
Other stuff: I also suggest dropping Traps skill completely, it's rather useless except to detect some mines in depot a.