Yeap, exactly. Preworkout is as important as post workout, even more so according to some bodybuilders like Milos Sarcev.

Try upping your protein intake. Eggs and milk are your best friends to fill in caloric and protein deficits. And you don't need to just drink 500ml water during workout. =P Sometimes i drink up to 3 litres of water at one session.