Yes, I would say try Wheaten breed rescue as well. The dogs will be in foster homes, well cared for and you will get a bit of their history and info on the personality of the specific dog.

Good luck!