There is the tempting but unclean (unclean!!) option of disallowing
partial templates, then cleaning up certain constructs afterwards. A
series of <ul></ul> nodes can be merged into one in DOM or text/regexp
etc.
Reforming wikitext should be something we are considering. We did it before, and ran batch conversion. Back then it was on a much smaller number of articles, but it's been done.