Building a Set from Scratch

So, as a new comic, I've been working through a lot of material. Some of it good, some of it bad, and some of it really bad. I understand, however, that a big part of working through a joke is just running through it over and over. Testing it in front of crowds, tweaking it, taking parts out, switching up the order, etc. I've been hestitant to repeat jokes too often, out of courtesy to the few consistent friends who come to show after show, but also because it would bore the hell out of me. I don't want to tell the exact same jokes week after week. On top of that, I'm not working toward just the perfect five minute set, I'm eventually working toward, in theory, a killer 45 minute full set. Not to say that it will happen any time soon, but you may as well shoot for the stars in the hopes that you'll at least hit the moon.

Here's what I've been doing so far to achieve that. 

1) Never tell the same joke twice in the same way. I'll, of course, tell my best jokes more than once, but I try to understand what was funny about it and why. I slim it down over and over, taking out anything that doesn't build to the punchline. I also try to imagine what other punchlines could work, and see if I can work that in somehow to get additional laughs. 

2) Change the surroundings of a joke. I try to write transitions whenever possible, and I don't expect a transition to be hilarious, just effective. If it gets more than a chuckle than that's just a bonus. However, When you pair up jokes in different orders, then you get two potentially new jokes out of it: the transition into and out of the joke. Sometimes, just the juxtaposition results in new jokes that I wouldn't have thought of otherwise. 

3) Loosen up the timing. Oftentimes, I just am not pausing enough. Even if I go up with a joke that's practically unchanged from the time before, I try to change the rythm and add pauses where they weren't before. It often works just enough to get an intermediary chuckle during the buildup to the punchline.

Does anyone have any other ideas to try?