Hi @kev,
Just having OpenZeppelin Contracts will make life much simpler for the community.
Will post when there is an @openzeppelin/contracts-ethereum-package 2.5 release.
As an FYI: OpenZeppelin CLI 2.8: Release Candidate includes regular (non-upgradeable) deploys.