I tried half a dozen or so of the various suggested remedies in this thread and nothing had any effect.
But when I switched on developers mode my battery drain problems disappeared.
Now back to a good solid battery life again.
Thanks, Anthony Appleton!