Have you checked out /e/OS for your oneplus? They do their own version of aurora and f-droid mixed together. Works well!