I too have a XD40. I have the all steel frame Baby Eagle, 1990's version from Israel. It is hands down my favorite gun. I also bought a XDm 9 in the 5.25" variety, it's almost a waste of money because I enjoy the Baby Eagle so muc more. The all steel frame soaks up recoil and make the 9mm feel like a .22.
I highly recommend that gun! You will not be disappointed and you will never have a need for the XD9 in my opinion.