As I'm reading your post I'm thinking...what an idiot...you know you can easily edit your template yourself...you paid someone...ahahahha. And then I scrolled down and saw your new form and I have to say that it really does look soooo much better. Very nice!
P.S. - The only thing for me is that I use double window envelopes for mailing everything so I'd need to maintain that format...I'm sure it could be done though.