Chalf,
That looks like some great stuff, you have definitly put more thought than I had so far.
I like your idea for the energy shields, gives them the protection for a combat, but not to a point that it unbalances things.
If I ever get around to putting more thought in to mine I'll post it here.