I've got an MC16 and live in NZ too.
All I can suggest is getting MC18 barrels and heads (second hand)from Victorian Motorcycle reckers in Aussie, that's where I got mine from.
Getting Honda parts in NZ is expensive.
Trust me, I've been there.

What ignition system are you using? That's the next thing I'll be looking into.