I don't know much about that model of Caldina, but a friend of mine swapped that engine (3SGTE) into an SW20 MR2 and used a manual gearbox out of a Camry. (E153)... his car is really light and quick!
i think swapping to manual is almost always worth it... i believe it frees up some hp...
my2cents.