Fly rod recommendation

I am currently looking to upgrade fly rods I have an orvis Clearwater 5wt floating and I have a tfo nxt 6w with sink tip For streamers. Looking for good upgrade around 500-600 cnd price range. It will be solely a trout rod (mainly mountain creeks/rivers) Mostly dry flys and small nymph rigs I’m also looking on some advice with choosing 4wt or 5wt rod. Thanks for your help and time!