Hi Ryan!
I'm going to try and keep short and sweet. Jesus told His disciples "Watch and pray so that you will not fall into temptation. The spirit is willing, but the flesh is weak." See I think here, He gave us an amazing revelation. Prayerlessness opens us up to a temptation that we had no business battling, in the end we yield to the flesh because our Spirit "is weak."
I've been in your position, self-will and discipline, and other control measures can only get you so far. Not to say they are not useful, they are just inferior, in my opinion.
But if you seek intimacy with Him, you will find Psalms 22 true, "... In Your right hand there are pleasures forever." Can you see that? He has the true pleasures! Anything else is a counterfeit, and guess what He wants you to have the real thing! And do you know that He wants you to have fullness of joy and pleasure more than you desire to have them? It is just that everything has to be filtered through this thing called 'The Kingdom of God', that has to come first, ALWAYS! And everything else falls into place.
So keep your eyes on the one Who stretched out the heavens and laid out the foundations of the earth, and other desire will melt in comparison to His desirability. You will win battles not through fighting but through genuine worship.
Hope that helps!
Brian.