Here is an update on my custom rdp solution.
Initial testing only uncovered minor issues. After those were resolved we deployed it to a few of our users that connect to all of our terminal servers. I am using it when I VPN into my work machine. Several high traffic machines were secretly changed over. Not only was the change over smooth, the users had no issues with it.
We are ready for production. As we rebuild or deploy new machines, my new client goes out with them. Once I have about 10% deployment penetration, I plan on pushing it out domain wide with group policy.