This depends on how "not adequate" it is. If you think 3 teeth less would do it, then by all means just drop down to a 39 and pedal on. If you feel you're going to need more, then yes, go with a compact double, I would advise square taper as there isn't a reason to change your bb unless you are having issues with it.

Joe