I'd just swap out the i180 pieces with accuracy then, TBH - building for damage is generally easy to work with.