I have the very same working code in both directories. Obviously, this isn’t ideal …
Is there a way to come round this?
Stupid me, just include the partial in the shortcode!
That’s how I do it 
If I remember well, just pay attention about indentation in your partial.
Flatten the code helps avoiding rendering issues.