If those are the choices you have settled on I'd make plan B plan A. A lot simpler and probably less expensive.
I completely agree with you. That's the reason I'm out looking around for engine being parted out to get the end cap. So far, I'm not having much luck locating an engine like that let alone the end cap. Those end caps must be made of Unobtanium or Unicorn dust.
