Personally, you don't want my answer, lol.
From what I've been able to find out (Doing the Omar thing everywhere to try and get to a small percentage of the knowledge he has), The Challenger would be the better hull, and yeah, without question, the Berk pump.
Swapping all that around, well, major deal (I'm gonna get into just that on the Hallett) Might be cheaper to get a new wife

Just kidding, just kidding, gotta get 'em in where I can!

(Unless you really don't like her.........)
Ray
And yeah, gotta keep mamma happy. I would seriously look at dumping the hulls and get one that more suits what you're after. They are a dime a dozen out there right now for project boats.