Tyler Johnson possible return in April?

After having successful shoulder surgery on 3rd February, Tyler is hoping he can still help Miami this season. At that moment doctors and Miami where sceptic about his return:
On 7th February "The doctors said it's going to be two to three months before I can resume contact," Johnson said, via Manny Navarro of the Miami Herald. via Bleacher Report
Barry Jackson reported on Feb. 13 that "Miami isn’t counting on [Johnson’s] return this season after shoulder surgery, though Johnson says an April comeback isn’t out of the question." via Bleacher Report
But now as he's recovery is going faster than planned there's a question which Tyler will return? Before the injury he was one of the best 3-point shooters in Miami besides Bosh. He was averaging 8.7 points and 2.2 assists while shooting .488% from the field and .386% behind the arc .If he stays the same as he was before it would be really great for Miami!
"Johnson, recovering from shoulder surgery, said he’s able to do everything on the court except shoot," reported Barry Jackson of the Miami Herald. "He still has pain when he shoots and has been advised not to do that until the pain subsides. He said he remains optimistic about an April return."