If you are pitching enough yeast, you probably do not need a diacetyl rest at all. That being said, if you want to anyway, it's best right at the end of fermentation as you said. The yeast are plentiful, still active and the rise in temperature gets them out to clean everything up.
I would definitely not let a lager sit in a bucket for that long. In the Better Bottle you are fine.