Its possible that I might be able to get it into this month's release if you get those changes done soon. My plan is to clone it and change the namespace and table prefix and resource file names and feature guid so it won't clash with any installations where users have already installed your current version. I don't think it will take me more than a few hours to implement the other data layers.
Once it lands in our repository if you still want to evolve it further I can give you commit access.
But no pressure at all, if it doesn't make it into this release it can make it into the next one.