If you guys haven't already got a relationship with TÜV, you might consider talking to them about certifying your next revision. They handled all our regulatory (domestic and int'l) with a lot less difficulty (and deadline slipping) than doing it in-house.
Do you assume that their might be any problem with customs (e.g., due to the CE marks) when importing those devices to Europe? If not I'm considering using Borderlinx (https://www.borderlinx.com/) to import the device.