I am planning to just HODL my bitcoin now.
Just like you siaid, merchants are jumping in. Starbucks which is a big name by now increasing the popularity of bitcoin with just rumors at first.
If more merchants happens to do the same then we will see a rocket blasting to space in the price of bitcoin.
Good news is altcoins will be pulled too.