I'd recommend fully committing to the sun-- having two pokemon that don't take advantage of Sun at all isn't ideal. Special Attack boosting Wake, especially if you go Modest, should be sufficient for stallbreaking. Great Tusk and Hatterene may work well over Corviknight and Gliscor.