I think that's all you can do for now as lightweight migration gives you no opportunity to intervene and, as far as I know, custom migration fails with iCloud enabled.
Topic:
App & System Services
SubTopic:
iCloud & Data
Tags: