Two types of people and all that. OP is clearly a tinkerer. Telling them that they shouldn’t value their time this way seems silly. If I was the OP, I would do

Two types of people and all that. OP is clearly a tinkerer. Telling them that they shouldn’t value their time this way seems silly. If I was the OP, I would do this exact thing: after putting some more miles on the bike and saving up that gas money, get a nicer bike and swap the motor. Better yet, sell this e bike for $2k now that it’s all upgraded and use that money for a full upgrade.