If the X10 is becoming flaky there a tons for sale. They are old, you may need to purchase a couple extra to make sure that you get one that works. Also, X10 is sensitive to house wiring and surge protectors. You may need to shuffle things in order to keep the signal level high enough.
For DIY:
IR to ZigbeeIR to ZWave
