Hello, I am British by birth & also an Australian citizen. I…

Hello, I am British by birth & also an Australian citizen.
I came back to Britain in December 2009 to care for my very elderly mother (now nearly 98)
When I first arrived I visited the Tax Office in Torquay, Devon (no longer there) who advised me that I should change my Tax Residency status from Australian to British.
I was asked if I was staying in Britain for ever.
I couldn't answer that question then - I had only been back about three weeks.
Now, 18 months later I know that I will definitely be returning to Australia.
Can't say exactly when, of course, but I know that I will.
I receive an Australian pension (paid into an Australian bank a/c) & also receive a British pension, which was instigated before I left Australia, but is now received into my British bank.
I have just received a Tax Return from Australia in which one of the questions is : "Did you have any exempt foreign employment income & $1 or more of other income in the 2010-2011 income year?"
Answer to first bit - No - I was already receiving Retirement Pension before I left Australia. I retired at 63 1/2. I am now 66.
Second bit. Does that include British Pension? And given that I am now a Tax Resident of the UK, does that apply?
Regarding the 'Tax Residency' - I feel I SHOULD be a Tax Resident of Australia - in no way am I attempting to deceive or do wrong by either country....I feel I should have left my affairs as they were, but was told by the Tax Officer 'they don't like it if you say you're leaving again'....
Perhaps - but I really did not know what I was going to do at that point....

Can you advise me what I should be doing re. that....?
I have asked other Tax Advisers about this issue, & as yet no-one has been able to tell me the steps I need to take....