Good thinking. That should work.

bibere usque ad hilaritatem