I just replaced the water pump and the radiator cap, the water pump was leaking radiator fluid out of it. Since replacing it, I haven't smelled any coolant after the car has been running, I'm going to be driving 20 miles round trip tonight to see if it does overheat.
This overheating problem has had me invest $800 into it so far.