Get an Airport Express to bridge, and get a strictly ethernet router.

Thw WRT54g is probably fine, but scares me for some reason...