I would def finish out the apprenticeship with that guy since it sounds like you have been doing well and don't have that much longer (I personally made the mistake of leaving companies too soon in my apprenticeship). I am not sure what your area is like, however having a bit of commercial experience could help get into industrial as well. Things like bending pipe and getting comfortable working with metal vs wood could make an employer feel better to call you in for an interview. In my experience industrial is usually limited to a couple guys so it may be easier to get the feel of larger tasks with more guys around who could help out. (We have more commercial opportunities than industrial here)