Robert Whittaker is plotting his return to the Octagon, with a shock move up to light heavyweight on the cards.