Well, just a thought but I think the Triumph 955i Daytona, Sprint or Speed Triple motors would basically bolt right up give h.p. increases and might be easier to source/find. Is rebuilding the existing motor an option?
Probably more expensive than sourcing another motor though.
Sorry to hear of the issues you are having.
I saw a subliminal advertising executive, but only for a second.
-- Steven Wright