Technical swap advice needed

Well, I just purchased a 98 Honda Civic HX. I love the motor, it's fairly strong, but not the fastest. It's got the CVT tranny.The tranny has got a few quirks. For instance, it will downshift to first and not shift up until I shut the car off and restart it. It usually only does this after I have driven it a while and it's gotten time to warm up. I am wondering whether it would be cheaper for me to swap the cvt with a 5speed, or just get a different motor/tranny swapped in.

I would like to get this done at a shop, so if anyone runs a shop and has done these type of swaps before, what kind of appraisal am I looking at for these? Without the motor/tranny obviously. Thanks a bunch guys, and I apologize if this has been posted a lot, and if it's in the wrong section.

Thanks!