I have recently been very much enjoying playing Jedi Knight II. It has a very nice system for lightsaber combat and is the most enjoyable game I've yet played in its portrayal of sword combat (sort of).

However, it is a bit short and not hugely challenging. Anyone know of any other FPS games which feature enjoyable sword combat which they would recommend, either for PC or for Wii (which seems to me to be a platform obviously suited to this type of game but I'm not aware of any games featuring it)?