Sorry to dig up a two-month old thread, but in the course of solving a different problem, I may have found a straight-forward answer to the problem presented by the OP. Here it is, for future reference.
The OP was on the right lines with the Gamma distribution. In particular, it is the Erlang...