Go with the electric. I got a bass because I thought I was really into the beat and bass lines but electric is much more fun and loads easier to play. You can always switch to bass later.
Go with the guitar cause once you kno that you'll mostly know the bass or itll be easier to learn because the bass is basically just the bottom 4 strings of a guitar