I have limited knowledge on the 1.8 to 2.0/2.3 swap. But from what I have read, a 2.0 or 2.3 is a somewhat easy swap, from a 1.8. What I have mainly read is how people swapped in a 2.0 or 2.3, when the 1.8 timing components ate themselves.
Highly Recommended: 8 local business owners recommend The Swap Sheet. Visit this page to learn about the business and what locals in Ridgecrest have to say.