I agree with cale that you should talk to your LBS about seeing what can be done to make your current FX fit you better and fix some of the issues you are experiencing.

If you like the FX but have some different requirements now, the Trek DS 8.2 has a front suspension with a lockout. Great dual purpose road/trail bike. Won't break the bank at around $549. Mine has been adjusted a few times by the shop (handlebar stem swapped out) to get to the right riding position for me, which is also slightly more upright than my old Cannondale.

Either way, go to your LBS and talk to them. Try a few different bikes, and see what fits and makes sense for you.