I'm so sorry this is happening to you right now.

do I want to continue doing what I like (web work) but be unhappy, or do I want to continue working where I am already happy and learn new things?
I think maybe your answer is right here. Do you want to get up every morning unhappy in your job? Will you stay at a place your unhappy with? Or do you want to get up enjoying what you do and learning new things?

Sometimes when we are torn between things, just answering the simple question without over thinking it, makes the choose easier.

Then go talk to your boss and find out what "find stuff for me to do" means in real work terms.

Good luck on whatever you decide.