i don't have very much experience with DE, but sounds good so far.
i think it's best to work on the lather for now and not bother with pre-shave oils. or try them, just keep in mind that until you can get consistent and repeatable results with whatever you're doing, changing too many things all the time makes it harder to figure out the bottleneck(s).