Your Yaesu supply should do fine, but you are correct in wanting some 'extra' reserve. It appears this one has that, and of course, the Max. current needed by your rig is 23 Amps and you will normally not be drawing that for any length of time unless you run a digital mode at full power.
Consider though, that if you are going to run additional accessories off the supply, then you might consider something with a bit more 'reserve', like a 25 Amp continuous, 35 Amp peak unit. The one I would consider is one of the Astron 35 Amp supplies, metered or not, and switching or linear; your choice.
Many hams use one of the Astron supplies, either the switching or the more traditional linear type. In any event, try to keep the power lead from the supply to the rig reasonably short to avoid voltage drop due to line resistance.