Staff of the Woodlands (modified)

I am quite fond of this staff, however, I would prefer the following changes:

REMOVE
(i) Wall of Thorns (6 charges) and

(ii) Tree Form

ADD
(i) Shillelagh;
(ii) Mending

(iii) Goodberry (1 charge); and
(iv) Plant Growth (3 charges)

Note, I interpret Mending as capable of healing plants (not plant creatures).