There are many, many, threads remarking on how quickly S-04 does its thing and drops. This seems to be everyone's (give or take) experience. It sounds like that part of your procedure went very standardly. Regarding your other questions, I'd just leave the batch alone for a few more weeks and bottle. I can't speak to your extract proportions but the grain bill looks like a generic Irish Red--probably Notty would be used in lieu of S-04.