You can use combination of indices to classify phenomena more accurately. I suggest using Modified Normalized Difference Water Index (MNDWI) and Normalized Difference Vegetation Index (NDVI) for more accurate classification of water. In the infrared band, water has very little reflectance compared to the red band. As a result, in NDVI index, negative values will indicate water bodies. NDVI is as follows:
In more densely populated urban areas the value of normal NDVI is positive, although closer to zero. Water bodies which have a rather low reflectance result in slightly negative NDVI values.
You can apply pan-sharpening process on your satellite image (on Envi Software) with using panchromatic band. Then you can increase your resolution from 30m to 15 m. So you can get higher accuracy results with good classified LU and LC image.
Try to get additional training data and to identify threshold values for your land cover classes. You can also try Otsu method (in Envi) for a better separation of land cover classes.