yoga, it sounds like you have thought about and considered all the options available to you. I was just raising the "what if you went back" as I have had to eat crow with myself and backtrack on what I had spent good money and time on, only to realize that I was going in the wrong direction with my great new idea.
I have not raced for years now, but my buddies and I still have some fairly competitive rides when we are out. In the type of terrain we ride, which is hills/gullies/mountainous, rocks/roots/log jumps etc, I find my e-start, and the rekluse to be a game changer for me, to be able to catch up, keep up or stay ahead if I stall. I've noticed, that I don't normally stall in the middle of a grassy field, it's usually on the side of a rocky rooty, chewed out climb, up a side hill covered with wet skinned off rocks and roots, swatting at flies with one hand, trying to get the kicker out and balance the bike while maintaining balance ,where my problems occur.Maybe it's just me, but I will not go back to a kick only bike!