Either of the two basses should be nice for you - your choice, really.
A very quick word of caution about making the switch:
A few years ago I had a real nice Fender Jazz 5-string.
Didn't perservere with it, or use it enough to get confident on it.
Sold it. Regretted that ever since.
Just got a Retrovibe RV5 (Ric style) and I am determined to win through this time.
Corking sound and very happy with it. Recommended.
I made the same mistake. I bought a beautiful mint condition Fender Jazz 5 MIA and sold it after a couple of months fumbling around on the neck. also regretted it immensley.
Have a Warwick 5 now and will not sell it. Even if it is a bedroom toy, I will persevere with it, though I have no intention of giving up 4 bangers.