Always played Apollo Hump Rs in my wedges. They are in my current set of Cleveland CBX2 wedges. Will be on the lookout for the next phase, likely Fujikura Heavy Weight Graphite.
If your 54 is for full shots like you mention, ideally, I'd want my full swing irons to match. I'd order a no charge shaft and have it reshafted with a recoil dart once received. It's not an ideal situation, but that's what I think I'd do.