You have been working hard and it looks lovely as a result :)
In answer to your question I build my worlds for what I want to do with it. So I use store as well as expansion packs. If you plan on sharing, and you should :) then perhaps two versions might be the answer. You can never guarantee other players have the same store content as you. The other thing I have found is EIG can be very temperamental about store content. Too much makes it difficult to open without crashing.
More pics when you are ready would be lovely :)
