Running too hot!!

[DRASTiK]

To answer the above questions, yes it's running around 230-240 when I'm not on the highway. When I'm on the highway running a constant high speed, then it stays around 185. The car heats up very quickly and unless I'm moving (highway), then it keeps climbing until it reaches the 230 area, then it stays put. I haven't actually had it overheat on me yet, but it still scares the crap outta me and it's just a lot hotter than I want it. I did cut out the gaskets to match the cooling passages. I'm using fpp-1250 lower intake gaskets. I'll give the 180 a try along with the new waterpump. For some reason I just have one of those gut feelings that my problem won't be fixed there. Would a high flow waterpump be more wise to buy, than a factory replacement? Budget is a big issue here (just had a baby on the 20th. See thread in Lounge.)
Dave