Fix payment entry deadlocks and per-row queries found by load testing

Removes a gap-lock deadlock on Payment Entry insert and several per-row queries found under load.