I had a similar issue and my DM let me buy two homebrew items that I really liked:
Squirrel figurine: allowed me to wild shape into < CR1 forms at will. This allows me to not waste a wild shape for role playing purposes. I'm looking forward to trying to spy in a wild shape form (perhaps wonder...