3.5.6 does seem significantly faster. It looks like it will finish in around 2.5 hours, which isn't great, but I can probably work with it for now
I also saw it mentioned here that the Dorg.neo4j.kernel.impl.index.schema.GenericNativeIndexPopulator.blockBasedPopulation=true setting might speed things up. Do you think that's worth trying?