Yes, house renovation can be a pain, because to find middle range contractor with good quality work is not easy.
I can recommend you ReFit, they specialize only on renovation and upgrade. You may call 050 152 2280 Naz on this number for advise.
It depends on the price of the property and i would not suggest to invest into more than 2 beds generally, because your returns are always lesser compared to studio or 1 bed.
If it is for your own use, it may make sense based on the financial calculations.