They are both elements of the Pocket Portal which is separate and distinct from the actions of the Pocket Protocol (v0). The Pocket Portal is essentially an application layer on top of the Pocket Protocol.
The “Cherrypicker” (which is a polarizing name) is part of the current Portal (v1) logic. We are currently in development on the Portal V2 which is focused on implementing numerous Quality of Service guarantees that will operate at the application level.
Hope this helps to clarify.