If you find that BA is not worth staying with, I suggest Finnair because their program is relatively easy to maintain Oneworld emerald with D/A fares on BA / AA coded flights. If you are able to get BA codes on most flights then this shouldn't be too much of a change.
Plus, you can transfer avios between BA and Finnair easily.