Monopolistic Competition and Efficiency under Firm Heterogeneity and Non-Additive Preferences