Like simon said - take the rad out and take it to a radiator shop, they can take the tanks of and check for blockages, running water through it can only do so much.
Last time I did that it cost me $30, and worked a treat, I had same symptoms as you. (I also did the heater/windows trick for a while, just note that when your motor gets hot the oil will start breaking down in temps its not designed for)