Been down that exact road before, and switching to pure botanical profiles made all the difference for my homemade setups. You should check out
https://terphouse.co/collections/terpenes-for-vapes since they focus specifically on concentrated plant aromas and strain-inspired blends for oil infusions. I grabbed a tiny bottle of their fruity profile last month, and just a single drop gave my mix a super smooth, authentic taste. Having batch lab reports available right on the site also gave me total peace of mind.