To the original question...don't forget 'bridges','breakdowns','interludes' and other general 'fills' that can change a song from one tempo/key/felling to nearly anything you want.Choppy rhythms,staccato licks,polyrhythmic shifts...all can blend a verse or chorus to one another.
Try not to forget the drums and bass ALONE can change the feel so that a verse can become a very unique chorus(and vice-versa)with minimal change on the guitars part too.
Try once,fail twice...