Better knowledge of the shop spawns allowed me to save 15 minutes in the katana split.
Still lost a lot of time on the infinity sword split though.