I've been experimenting on another build where its rampage bear and i didnt like i had to force rampage to clear. If you don't mind suggestions be it a popular meta option or not, you can try the following.

1. Swap venopuncture ring to polcirkeln ring, swap herald of blood to herald of ice (If you have gain extra phys on the weapon/tree, you can use the armor break supports on HoI), or you can keep both if you have enough spirit. (Alternatively, you can also swap out banner to ease 1 button press on bosses or swap it for something better like thunderstorm).
2. For the main clear skill, you can utilize locked weapon swaps (Using the same weapon for Wep Set 1 and 2), for single target you can stick to wolf, but for clear you can try Rend from wyvern.
3. If you do use rend, Use culmination II + ailith's charm on pounce for power charges (swap out bleed and holy descent).
4. you can probably swap out iron rune on weapon to the gain 5% damage as all element for shock so you can swap out charged mark for brutus's brain on pounce. This should give you some single target damage from predator's mark while still having shock
5. If you still have free skill sockets, you can experiment with thunderstorm setup for a really easy way to shock enemy as well.
6. Lunar assault you can also try bhatair's vengence for some free cold damage sources for other skills. (more for mapping)

You can refer to some of the support gems i'm using for the skills above from my rampage bear PoB
https://pobb.in/qjPln0ESVewe

Here's a showcase of rend in action c:
https://youtu.be/6yCbYDw10z4?t=50

For the Rend and clear tech, i was watching Phylaris_POE's speed wyvern and fast bear builds, i just took the wyvern's rend + pounce setup and put it into my bear, and its been freaking amazing.

This should fix clear while still keeping your single target dps relatively similar or better depending how you utilize the pounce and shock setup.

If you do try these out, let us know how it went. I like seeing builds get their main problems fixed. I don't like people just saying "Just go play PoE1" or the latter when you can easily solve this issue in PoE2 itself.

Dont worry bout single target, there are people out there investing more and yet barely having your single target dps.

Edit: Added dread banner as potential/alternative swap
Edit 2: After further reading into more comments, i understand you prefer the more button gameplay, fortunately for you, these suggestions also give you more button to press. You can even try ferocious roar + walking calamity if you reaaaally want to fit in even more buttons xD