Glad things are improving, definitely good idea not to share their toys between males & females, guineas have the most amazing sense of smell & even if you clean the toys, chances are they will still smell the females & react to it.
By the way Willowthehamster, our guinea is called Willow too!