Is my handyman business in France registered correctly?

I have been an auto-entrepreneur business in France since August 2009 with a NAF Code 9529Z (Reparation d’autres biens personnels et domestiques), in effect a handyman. My work in France is mainly domestic gardening, cutting grass, clearing leaves, strimming, hedge cutting, weeding and pruning. Plus meeting guests at holiday homes and keeping an eye on them when they are empty and odd jobs, such as putting up book shelves, pictures, curtain rails, sanding shutters and applying lazure/varnish.

When I made contact with cotisation foncière des entreprises (CFE) to register as an artisan which I understood I needed to do before 19 December 2015, they indicated I needed qualifications and also indicated I should have building insurance. I do have past agricultural qualifications however no others, but I do have over three years experience and have been successfully running my business for the last five years and have auto-entrepreneur Assurance.

My concern is CFE could make the registration process more difficult, possibly withdraw my Siret, making it impossible to work. I would like your advice to clarify:

1. Confirm if I have the correct NAF code or I should change for one’s to cover Petit travaux de jardinage, (primary activity), Travaux de petit bricolage (secondary activity), and entretien et vigilance temporaires a domicile. Also please confirm these NAF codes and whether these can be used within the auto-entrepreneur business scheme.

2. Confirm if qualifications are required for Petit travaux de jardinage, Maintenance, entretien et vigilance temporaires a domicile and Travaux de petit bricolage to register with CFE and faire une régularisation de situation auprès de la Chambre de Métiers soit une entrée au registre des métiers et de l’artisant (RM).

   On entreprises.gouv.fr under a sub heading of Agent d’entretien de petits travaux et de jardins it states Aucun diplome ou titre n’est requis. Une personne qualifiee le domain du jardinage ou l’entretien peut etre un plus pour exercer ce metier.

3. Confirm if I can continue to work within the auto-entrepreneur scheme making payments to RSI under NAF primary code Petit travaux de jardinage and Travaux de petit bricolage if I change NAF codes on your advice.