Welcome Mike. well done! the challenge we face on a blues like that (especially the amount of choruses they gave you!) is to give your solo a gradual lift…so the 1st 12 bars are a “One” and the last 12 bars are a “Four” in terms of exitement/lift for the listeners.
we should all have plenty of “out of the box” licks as you say and be able to “line them up” accordingly for the build-up.
Good examples of this are the tunes Honky Tonk (Bill Dogget) and Tic Toc (Lee Allen)….to name a couple.