your doin the right thing mate just because its a working dog dosent mean its got to screw every and any thing in sight.
some off the best working dogs i have seen have been good pets.
get the basic stuff right at the start and working side should come with time