Sounds like you already solved your problem but are seeking affirmation, so I'll give it. Your approach sounds perfectly valid. I've done that before and it works fine. And it's fine to apply the parameters to the unstripped epis, but on the other hand you could just continue on with the stripped EPIs for the rest of your analysis. What do you need all that outside-brain stuff for anyway?
-Jed Meltzer