Yeah, a 6-String is the way to go, Kimberly. Both/and is better than either/or.
Personally, for me, a 6-String is the minimal number of strings. I've got 6-strings on my guitars, and I wouldn't want less strings on a bass any more than I'd want to play my guitar with only 4 or 5 of it's strings.
One interesting way I've seen to extend range it to tune the strings in 5ths. Now this doesn't grab me at all as a main tuning. But -since I play Mandolin a little and am familier with the scales and arpeggios- I do appreciate it. It requires more shifting and movement to play scales and whatnot... but it adds a lot to your range on a 5-String. From a low B, it would go B-F#-C#-G#-D#... 3 notes higher than a 6-String bass' 24th fret high C!
But, if I did that, it would be a specialty & backup bass.
The 6-string I've got on order will basically have a 5-string neck. You seem reasonably dexterous, so you might consider a similar concept at some point -if so inclined. If you can handle a 5-String, you can likely handle a 6-string with the same width neck.