It's been great collaborating with you on this, @ARIF_AZAD_KHAN and @Xiphware. Hopefully this will be another useful resource in the fight against this virus and for ODK usage in general.
I went through and made some light edits for consistency with the paper form and the A0 ODK form. Looking more carefully at B2, I don't think it's worth designing separately. As @ARIF_AZAD_KHAN notes, it's a subset of B1. I think that whoever deploys this will need to consider carefully what their workflow is for contact re-visits and change the form design accordingly.
I turned off public edit access and gave @Xiphware edit privileges. @ARIF_AZAD_KHAN, I'd like to give them to you as well but I don't have your email address. Please request access so I can grant it to you.
I'll publish the form in a separate post so it's easy to find.