Following the capital return this stock will be trading on a 2008 p/e of 10 with a 4.5% yield (assuming a corresponding drop in share price). This doesn't include the predicted 'special' dividend of 12 cents per share or any earnings upgrades.
Production improvements appear well set so you could be on the money with your thinking.