On the topic of Multi-Tenancy is may be useful to simplify the filtering by tenant using an EF global query filter.
eg code taken from dotnet sample (here)
Of course there is more than one way to do multi-tenancy. I do wonder if using the http context strategy might be quite involved compared to other techniques though.
Food for thought...