I fixed the problem today by swapping the valve body from a spare transmission I had. Shifts smoothly through all the gears now!