Looks like it's getting resolved, thanks for the suggestions. Ecotricity are happy to swap the meter back to a normal one if I switch to them and surprise, surprise, EDF changed their minds when I told them and are offering to swap the meter back too.
Not that any of this is relevant to my...