This has been discussed a lot here .
***** here in australia will rebuild mc18 cranks for around $600au
There is a place over there that advertise on e-bay can`t remember the name .
I would prob use the 21 bottom end as new cranks are available . With the 18 barrals that flow a bit better.