I broke my collarbone last april after slamming my shoulder into a rock. It took forever to be totally pain free (like 3 months) but I was back riding after a few days once my arm was able to hang without pain. I dialed it back a bunch to make sure I wouldn't fall on it. I basically did everything I could to not impact that area if I knew I was going down.
I was told that rest is the only thing that can heal it, unless the bone is out of place and bulging. Then you get surgery.
I wouldn't sit out your trip if you can handle the pain. Especially if it will have been over 2 months since injuring it. And based on what you described you seem pretty healed up. I think bones only need like 6 weeks to heal generally. That stiffness/aching with over exertion lasted a while before it tapered off into nothing. Just be careful because your bone is prob still weaker than it should be.
NOTE: I am not a doctor but I play one on the internet...