I definitely thought of Koolies!
If you like the spaniels (which are different than retrievers IME) a field-line Cocker would probably really float your boat. I know I'm always saying this, but Ollie is like screeching, shaking, spinning obsessed with toys, boundless energy, happy go lucky, solid nerved, very naturally easy to train, natural focus, and has no problems camping out on the couch when you do. He's a high drive dog for sure but my mom has no issues with him as a relatively untrained house pet. He's got ZERO aggression in him, and even as an adolescent intact male, no sense of male-to-male aggression or manliness.
When I've worked with him formally he's eager to please and very biddable. Also ridiculously food motivated. He's not soft or nervy, which I know some people worry about in Cockers.
Very much an easy to work with, ready to rock, happy-go-lucky little dog.
ETA: Also would play well with a PyrShep, just sayin'