We have exactly the same problem. Any solutions are wellcome!
There is not yet a clear distinction between portal and adds on. In my opinion you should not rely on these adds on, the team does not respond so the question is : is it stable? will it remain?
The current solution is to rewrite your own.