It's a commuter, its gonna get dinged up. Leave it as is or do some of those upgrades now to this bike and then get the new frame last and do the swap.