OK. That doesn't change my answer though! It is hard to answer without seeying your setup and swing anyways.

You mention that 'someone' changed your setup. If this person is a golf-teacher, or otherwise qualified to help you with your swing, it couldn't hurt to have him or her take a second look, or to have him/her help you find a solid in-between setup. If not, I cannot see anything wrong with you looking for it yourself. Devote 1,2,3 range sessions to it, working on just that. Good luck!