Playlists and music are not syncing (can't add any music to my iPhone now)

I've been having a lot of trouble with Apple Music! I have a pretty large iTunes library (25k) and have been using iTunes Match. At first things seemed okay on my iPhone 6. I added a couple of albums and it was good.

Then I got iTunes 12.2 and the music I added from Apple Music showed up greyed out. Nothing I did seemed to make those songs want to become available. I saw someone posted to delete the songs from the iPhone library and then add them using your Mac and then it would show up on both. No dice. I toggled Music on and off and had it re-download my music library to my iPhone. I still can't see the albums I added on my Mac (and which are clearly in my Mac library).

Now I can't add anything to my iPhone library. When I browse for an album not on my iPhone and click the "Add to My Music" button, it says okay, does the check mark thing, and then a few seconds later the icon switches back from a checkmark to a plus sign.

Basically I can't add music to my iPhone at all because I can't sync it to my computer (since now it syncs only through Apple Music), it isn't syncing changes from my Mac to my iPhone, and I can't add anything from Apple Music to my iPhone. Help!