Well here's the big update. Problem....supposably fixed :/

The guy at the shop said the water pump was circulating the water but was leaking so it needed replacing anyway. But he pointed out the fan wasn't working when it was supposed too. I told him I knew about that problem but my big problem was that I wasn't getting any circulation and he said that the T-stat won't open until that fan kicks on (I thought the sensor was after the T-stat and it had to open for the fan to kick on, also what MY mechanic told me) so it was contradicting what my mechanic was saying. Anyway he said I'm going to drive hot no matter what till I get the fan fixed. But before today, before I got the water pump replaced I would run hot like in 10-15 minutes. Well I drove it home (15-20 minute drive) then let it sit for about 15 minutes, then drove it around again for about 15-20 more minutes.....it's not getting hot...AT ALL But it looks like even though it seems like I'm getting circulation now the fan still doesn't kick on at all, so I'm looking to replace that sensor tomorrow.

All in all.....looks like I'm pretty happy so far.

EDIT - What else could stop the fan from working? Because both of them turn on with the AC on so I know it's not the motor, so I figured it could be the sensor.