Mate.... Lion was step 1 - when we started getting things like launchpad.  That was about a decade ago.
its no secret that there is cross pollination going on.  this isn't a bad thing.  they will both remain seperate platforms for some time, but there will be features implemented in both where it makes sense for ease of transition between the platforms.
apple isn't interested in selling you only one device (because there's more money in selling you 3 ideal devices than one jack of all trades/master of none like a surface), so there will be more than one platform.  but they ARE interested in you being able to work effectively on both platforms as appropriate.