I agree, with your usage upgrading to an X2 won't do much. Your best upgrade would be ram or HD. If your planing on eventually going AM2 or Conroe, HD would be the way to go. But for pure performance with your usage increasing to 2gb ram would be the best bang for the buck.
The raptors will give you better load times on large maps, and large drawings but not much more.