If you like S-04, then that would remain a perfectly good choice. I would suggest using Brett C for your brett strain. Brett C will produce a pie cherryness with a little bit of funk. Should go well with S-04, and it right at home for traditional English styles.