Sounds like you've made the right choice, why buy off the shelf when you can get something tailored for you, made locally for the same price? What shaper did you go with in the end? I do like the look of the Magic Carpet shapes, never tried one though, they look like a fun shape for smooth surfing when its small, cheater 5s in trim and all that stuff.
Good move going with something bigger to improve your style before going back to a shortboard too I reckon. Good luck with it