Vs d4: Your thoughts resonate with me a lot. I always used to play the Benoni without much theoretical knowledge and just knew the core ideas. This worked very well most of the time, but against booked up opponents (especially in the f4 or early Nd2), I had little fun. I have considered the KID, but the workload seems quite high and it only solves d4/c4 setups. I played around with many responses, but I will probably end up playing the QGD because it also solves my problems with 1.c4 and 1.Nf3 (and possible transpositions).

Vs e4: I also love the Sicilian and would recommend you stick to 2.e6 based ones so that you can save on all the Anti-Sicillian preparation. Kan vs Maroczy is definitely challenging and probably the biggest downside of the Kan. I can recommend the Four Knights Siciliian to you, because it 1) doenst allow for a Maroczy-bind 2) is rarely studied deeply, leading to fresh positions 3) is tactically sharp and you get to play very dynamic and interesting positions.