In similar situations I normally leave the working setup alone and test way and medical separately. It is a bit slower at first, but troubleshooting is much easier. It also gives you an easy point to roll back to if the next change makes things worse.