WHMCS MU and Pro Sites

I have read all of the posts regarding when to use WHMCS Provisoning and when to use Pro Sites. I also read several posts about Pro Site features being built into WHMCS.

If I use Pro Sites now will the upgrade have WHMCS functionality? Or, will the upgrade to WHMCS MU Provisioning have the functionality of Pro Sites?

I can get by with either for now and don’t want to manage both side-by-side. I’m trying to figure out what one to use now until the new functionality is released. I’m hoping I will be able to simply upgrade the plugin instead of having to reconfigure my site.