Personally I would stick with both. they are excelent solutions to solve diferent issues. from a VDI perpective I would look at CDS as it now delivers ICA to the VDI desktop via PortICA, this would allow you to get some leverage form a single managment environment.
Tom Howarth
VMware Communities User Moderator
Tom Howarth VCP / VCAP / vExpert
VMware Communities User Moderator
Blog: http://www.planetvm.net
Contributing author on VMware vSphere and Virtual Infrastructure Security: Securing ESX and the Virtual Environment
Contributing author on VCP VMware Certified Professional on VSphere 4 Study Guide: Exam VCP-410