i hold tey, but am eagerly watching gdy as they are without a doubt the leader here in aus, and with Origin involved.
tey is the higher risk play, but the factors you mention make it a worthy risk - and AGL agrees.
i am very tempted to pick up some gdy, but not convinced given its market cap???