I am in exactly the same position as you with edf and am currently on the GoElectric 98 tariff which ends in 30 minutes!
I have decided to gamble and move to the Standard Variable as that will be cheaper initially, although it may increase up to similar levels as the Go Electric June 24 tariff...