What you've been doing is obviously working for you so why tinker with something that's not broke.
We cant really say what you should do though.
We are all different with different circumstances, finances, goals, time frames & personal risk profiles.
So what people suggest here will not be...