I've got an 18 ft rough neck (2ft shorter) still big but lots of space for decoys, dog, buddy (if you have one to go along), blind etc. My feelings on a boat is big allows for comfort. Heck I can throw a tarp over the top bungie it down & go to sleep if I wanted.
And as far as pump & prop goes keep both. If you get it down you can drop the prop(with water pump attached) put pump in ( with its own water pump) in under 2 hours. That gives you a option of deep water lakes and shallow rivers.