I finally found time to look into it, helped by the fact that my phone also received an OTA marshmallow.
Good news is, I solved it.
I still have to check if I didn't break backwards compatibility anywhere though, but even if it does, I know how to segregate the pre-6.0 version from the post-6.0.
Bad news is, you'll have to wait for next version to be released... but I'm making progress on that front too. Stay tuned.
Or, I could just pull your repo and build it =D