How can I combine two displacement without the face normal changes of one screwing up the other?
I was able to achieve the effect I desired by using the Warp modifier after a displace modifier to provide initial organic displacement. Performance in Blender was much slower, but as I'm baking the results this was a non-issue.