I think I'll stick with Cal. Add a level of Scout since Bounty Hunter isn't exactly an exciting level this go around. I'll save that for when I get to pick up another feat. Just trying to figure out my new talent. Now that Cal is tacking towards sniper, I probably need to get a bit better at Stealth, but Evasion seems so nice...
As for gear updates, I would go with either a bonus to hit with the sniper rifle or a bonus to Stealth with the scout armor. If those are acceptable, I think I'll go with the sniper blaster upgrade.