There are some other non-diary sources of calcium like figs, leafy green vegetables (kale, mustard greens, spinach, beet greens; kale even has more calcium per ounce than milk), bok choy, turnip, okra, sweet potatoes, oranges, some fish and sea foods (salmon with bones (i.e. canned), rainbow trout, blue crab, clams, sardines), soy and white beans, tofu prepared with sulphate/nigari, blackstrap molasses, fortified oatmeal and cereal, fortified juices and probably even more. I understand that your LO is still pretty young and might not eat lots of these things but I think you can definitely get around not having milk and still getting enough calcium. Obviously some of these foods have more and some less, so maybe you can do a bit of research to see which ones work well for your child.
I would always go for the hugs and kisses rather than breastfeeding right now.
Hayden is becoming more demanding as well and I have a feeling that it will end up being almost the same situation as KM's once the baby is there. We'll see...