Get it back to the shop, for the freehub fix. It may be simpler for them to swap the whole wheel, and that may also fix the inconsistent spoke tension problem. Get them to check the spoke tensions with a tensiometer.