wouldnt swap just just yet, does sound like it could be from last time it went. you said u havent had any problems with the running of the car, might bw worth give the bottle and the rad a flush out, stick a garden hose down em, see how you go from there

dont think the xr2i would be as fun!