(1) seems grammatically correct. (2) seems wierd; I would write 'before which', where 'which' still could be either the bell or the return. The writer intends that the 'whom' refer to 'Mr.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.