Very pleased that you have decided to go back to keeping them separate as they both have different value propositions.
I would recommend that you create a chart with Desktop, Cloud and Server Options listed and ticks in boxes with what each product supports. This makes it very easy for users to compare the differences between versions.