A unified enrichment approach addressing blending and conditioning issues in enriched finite elements