Not sure what to do
My 2 cents- If you have to "save up money" to buy and build a short block I wouldn't personally mess with the present engine that you're not having problems with. Save up and do it correctly or teardown what you have. To me throwing performance parts on a well-used engine without a teardown is asking for headaches.