I know it's not a Toyota but Toyota do own 49% of Diahatsu.
GF's Appluase idles at 2500rpm and won't shut off properly when the key is turned off. I have narrowed it down to a vacuum controlled solinoid that opens up the butterfly to let more air in. It has a vacuum hose connected to the timing and the other to a vacuum block on a water pipe. When I remove the hose from the timing it goes back to normal and shuts off normally. I think I have found what causes it but I don't know what to do to fix it.
If I need to provide any more information I will do my best to get it.