Well Tanak is clearly most likely candidate for Tommi.
That said if I were from Toyota leadership I'd be a bit worried about getting 3 "Finish" drivers that mostly like same rallies (well we dunno about Lappi that much). Sure for one year during development it's ok, but as a long term strategy they should get someone very good on tarmac. But there aren't exactly many choices. (Ogier, Sordo, partly Mikkelsen (no tarmac ace, but prbly better than Tanak), Evans is also generally better on tarmac than gravel).
Getting Sunninen when they have Lappi as a "young" talent is imo also risky. See Citroen how it might end with 2 drivers with little experience.