Having Shutouts as it's own category is the bigger issue for me. If you can combine them with wins, adding a bonus for shutouts, that's what I'd do. If not, just do away with them.
Total Saves and Save Percentage are great categories. Personally, my favorite option for having 4 goalie cats is Wins (or, if on Fantrax, GPTS10), Saves, Save %, and GAA.