I feel like everything has been working but for me I intend to eat leaner protein, definitely drink more water and add a little more cardio. So for leaner protein does it make sense to have more fish?

Yes, fish would be a GREAT protein source. Having tilapia a couple times per day will really kick your results up.