Yes! 4 litres is probably bit extreme. You should drink about 2-3 litres. It is also important to drink plenty of water to avoid kidney stones.
You mentioned your pee colour is on the extreme side. You should probably get yourself scanned for kidney stones. Kidney stones can go undetected for ages.
I don't think I had kidney stones. My water intake before was less than 1l a day. Much less. So I'm guessing it was the reason for the pee colour being on the extreme side. I'm on the other extreme now.
