bitcoin has been both for me so far. i used it both as a settlement layer to invest and take profit and also as a payment system (p2p cash) and i love both of them so far.
AFAIK bitcoin was created as a p2p cash in the first place and i hope in the future it gets closer to this purpose, and i think it can get there too if the number of users increase and the volatility decreases.