Shloimel, you’ve takah got a emmese shvere matzev there. Ober mistomeh, you’ve got a bochur in your chabura who’s got yedios in this inyan. He’s the tipp that skips part of night seder (I know it’s hard to be mekabel, but they were meya’etz by the mashgiach (zol er zein gezunt) and his Rebbi, and lemaaseh bshaas hadchak it’s ok bedieved) to use a chainik in his room. He’ll know how to mesaken your Bors (of course you’ve got one, if you use such yeshivishe raid), and it will be a matzav of machzir atoro leyoishno.
If you post your mamme’s name, I’ll be machaven for you by ‘hachazirainu bekova shelaimo lefonecho’