I'm hoping this could be improved upon with the upcoming upgrade?
Definitely. One of the things that will be improving with the coming updates is the payout queue. Specifically, the percentage of blocks that make it longer will be reduced to near zero.
