If you're asking about overtraining, we need more details than this to really see what's up. The days, exercises, sets, and reps. "20-36 sets per workout" tells us absolutely nothing useful.
I will say, you almost-definitely don't need to be training 6 days a week.
What are your PRs in the squat, deadlift, flat bench, barbell or dumbbell row, and overhead press? Max push-ups and pull-ups?
Nuts aren't a great protein source because the protein isn't high quality and isn't efficiently used by the body. If you're vegetarian, that's your call, but if you can have yogurt, you can have other dairy like Puff said. Cottage cheese, Greek yogurt, and milk are good choices.
What "shakes" are you having - what's the protein source (not the brand/no links, just the type of protein)?
What was drinking more water supposed to change?