I think they're still separate issues in specific cases.
For example, if you made a motherboard with user-removable capacitors, that would not enable any significant upgradability, only repairability.
Another situation: If you have a $100 device and it has a major component that takes up most of the overall device cost (let's say, $80), making that $80 component modular/removable/replaceable doesn't aid repairability all that much. If that component fails, my entire device is "totaled."