Don't merge your accounts together. You have the right setup - accounts-wise. Changing it to joint likely won't solve issues, and untangling from joint is difficult.