Enriched CNN-Transformer Feature Aggregation Networks for Super-Resolution