As someone who has reached endgame in both Rift and WoW, I recommend Rift.
A lot has changed since the beta, and there are many things that Rift has that WoW does not. Boredom is not a factor in Rift as there is always something to do, even in the endgame, where in WoW you can do a dungeon...