I can not say with certainty, having never done it; However, I suspect that the 535 Virago engine would be the best swap candidate. What I have seen indicated that the 535 is very similar, other than bore and stroke.
Before discounting it in the basis of the 535 being smaller, consider, the 535 does put out more power and has a higher peak operational RPM.