I would definitely second the recommendation to take a train from the airport, not a taxi.

And I would probably go for the three-hour connection as well rather than the two-hour one - two hours is do-able, but I always prefer to give myself more time just in case. It usually makes for a more relaxed journey.