Waiting was not an option. I had to buy a car. My old 280z was too dangerous to drive because of rust. Also, when I bought my car(s), no one knew there was going to be an engine change. I think I would prefer the 2002, anyway. The conditions in which I drive make the wider torque curve more desirable, although I think the 1.8 would do a good job, too. Also, the M111 is at this time more readily modified. I haven't gotten any mods yet, but I will. Unlike many others, I don't think the 2.3 is a rough engine, and the so called tractor like sound is minimal in my car and only lasts for about 30 seconds.
I really don't think one engine is better than the other, just somewhat different. I would be happy with either.