I would highly recommend that you do not go the thesis route unless you plan on continuing on and getting a PhD.
My advice concerning coursework, if you intend a career as a design enginer, is to take as many design related courses as you can. Advanced steel and concrete, masonry, wood, and a...