As for the yeast I assume s-04 is a lower attenuation yeast?
My experience with S-04 has always been higher attenuation (80-85%). If I'm looking for a higher finishing gravity I go with the US-05 strain. If you keep the fermentation down in the low 60s it should keep the ester production under control too.
Just my $.02