I wouldn't continue with the massage until you can actually feel where the blockage is. Just hot pack, feed, pump, hand squirt the last bit, cool pack (the recommendation is ice, but I can't handle that, so I just use a cloth nappy wrung out in cold water)!
Have you called the ABA?