I’ve done quite a few imports as well, I’ve even written some tools to help import safely without loosing data. But some guidance using JOSM would help as well.