Can I correct the cost basis and also have the accounting method changed at the same time?

I put my house as a rental around mid 2016. In my 2016 returns (filed with turbo tax) I took the depreciation but the cost basis was incorrect. I stopped using depreciation since 2016 (mostly because I did my taxes and also didn’t understand it much). Can I change the cost basis this year? Also from reading on the forums I believe I will need to file a change in accounting using form 3115. Can I do both on the same return?