My child (A) is now 19 and a happy, confident human being who identifies as non-binary person. A was raised the same way you have described — toys, clothes and such have no gender classification of their own, body autonomy is to be respected, choice is everything..In my opinion you’re on the righr track. As someone else commented, be as careful and selective as you are able in your choice of schools (my child is an autodidact who did not attend school) and be prepared, as your child gets older, to advocate and defend when necessary.