Richard I am reading your link and my German is super crap but could there be a difference between "Private firm" and "self employed" firm? On your link I don't see any mention of "Selbständigerwebende".

Could you please tell me which address can I physically visit to put this to rest? I am in Zurich currently. The address on the attached form seems different from tha address on your link.