Your views in this regard are condemned in the Syllabus of Errors. Read them. Jesus was not speaking of Jonah situation as metaphor but as a fact in that he was in the belly of a whale for three days- then he used this situation as a simile to his own that he would be in a tomb for three days and would rise out of that situation also which to all eyes would appear hopeless as Jonahs situation was in the belly of a whale.
The origin of man has everything to do with Christ and his resurrection and incarnation. Do you believe in original sin and the fact that we had a single set of human parents from which spring all of mankind? Do you at least believe this fact?
And the Church put Galileo in prison because he said that the earth revolved around the sun.
Thomas Aquinas believed that the woman's womb was nothing but a repository for the male semen, which contained the germ of life.
The Church has had a sorry record in regards to science. I'm glad to see that JPII and enlightened theologians are embracing science, and debating its ideas.
Of course I believe in original sin and that ensoulment took place at a specific point in time.
In fact, my beliefs in this area mirror those of dsc. Read his posts; he expresses much better than I the Catholic view of evolution.