Well, I think I might have found the problem. I checked my coolant this morning to see if it was any good, (because the garage that just changed my WP and TB on Friday charged my $18 for it) and low and behold, it didn't read at all! So, I checked my girlfriend's coolant to make sure my tester wasn't busted and it read -45 C, so the idiot that worked on my car must have put the old watered down coolant back in and charged me for new stuff...No wonder it was heating up at idle. I can't wait to talk to these guys tomorrow.
Update to follow.....
Thanks for all your help guys.