swiss_in_training I feel for you - the differences in knowledge/service in the kreisbüros even within the same city really sucks especially if you're caught on the wrong side of it.
When my non-EU spouse married me (EU and C-permit holder) he was called in before he could blink to receive a shiny new unrestricted EU B Permit in place of his non-EU restricted B Permit. I would have expected the transition to have been even more seamless when marrying a swiss citizen.
I hope you can rectify the situation...