:O Kryal!
I have to rewrite the OpenGL stuff to support shaders anyway, just tell me what the best path to take for OpenGL support is and I'll do it.
Rewrite the rendering code and logic using the OpenGL shader language (which is based on C). Use minimal functions from OpenGL itself and stick to the GLES 3.0 subset (only use programs and shaders with element arrays)