At some point it would probably make sense to look into changing this into a HAF app. That would have eliminated all the issues you had with account history fetches and batching, because you would have a database that you could create custom queries on. It does come with storage costs, of course (unless you get someone to host the HAF server for you and run your app there).