Hmmmm. I'm definitely asking Revenue for a suggestion on how to proceed
This is of course entirely contrary to the spirit of self assessment and a revenue official could get in trouble if they were seen to advise a taxpayer, see Apple.
It is of course also a very sensible idea, and as you say they are usually very helpful.