You are correct to take the remaining 40% of the opening work-in-progress.
However although 2,500 units were completed, this includes the 400 units of opening WIP that were finished.
Therefore the total equivalent units is 160 + 2100 + 120 = 2380.
Have you watched my free lectures on process costing? The lectures are a complete free course for Paper MA and cover everything needed to be able to pass the exam well.