I created a generic HOC for the Initial Data fetching case that you've used, with some modifications:

https://gist.github.com/armand1m/69e390a681b4a8e0663cdda9df2f6bd4

It seems pretty compatible with what you've done, and makes it easier to use.