X5 replacement options for my specific needs

Hello,

Just throwing this out there to see what people may suggest. Nothing wrong with my X5 but I would like something where all my accessories are built in and a min. of WM5.

I do not need smartphone connectivity (as my work pays for my regular cell. I also turned my blackberry in because I wanted my own software/configurations and tweaks as opposed to only corporate cell and email).

Here is what I use my X5 for now.

GPS (via CF receiver)
Wifi (via CF card)
Keyboard (via Targus foldable)

The wifi and GPS are key here that I want built in. 9I also want BT for any future needs). I also want a built in camera though.

Is there any one single more traditional pda devcie out there that would fit in with my requests? Am I asking two much in a single device.

The Ipaq navigator seems to have all (except camera) and I like the looks of it but it feels cheap.

Thanks for the feedback.