Robin,
Have you looked at all at migrating to sip 5? It looks as if you might be able to get rid of the bundled copy of sip and just install sip from PyPI? Also, it seems to have its own build system now so you might be able to get rid of WAF too?
Yep, it’s on my TODO list.