After much thought and discussion about the best way to handle branching content, I've ended up creating a fully regularized version of each original primary source document, and using the original approach to switch between them as we do on the current website. This avoids a great deal of complication, although we will have to be careful about how we handle search results to avoid pointless duplication. We can index different document sets in both eXist and Solr.