Ours was originally plumbed like yours. After, we plumbed them like described above, our problems stopped. Good luck.